From 26eaf5d85828bab09aabdecc4a874a0e3faf1109 Mon Sep 17 00:00:00 2001
From: natemaia <natemaia10@gmail.com>
Date: Sat, 18 Apr 2020 11:26:05 -0700
Subject: [PATCH] Change to using pacstrap for base install to avoid issues.

---
 archlabs-installer | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/archlabs-installer b/archlabs-installer
index fbcd560..0ee6918 100755
--- a/archlabs-installer
+++ b/archlabs-installer
@@ -7,7 +7,7 @@
 
 # shellcheck disable=SC2086,SC2046
 
-VER=2.1.25
+VER=2.1.26
 
 # default values {
 
@@ -1448,25 +1448,18 @@ install_packages()
 
 	pacman -Qq archlabs-installer > /dev/null 2>&1 && rmpkg+="archlabs-installer "
 
-	if [[ $NEWSHELL == 'zsh' ]]; then
-		inpkg+="zsh-completions "
-	else
-		rmpkg+="zsh "
-	fi
+	[[ $NEWSHELL == 'zsh' ]] && inpkg+="zsh-completions "
 
 	[[ $INSTALL_WMS =~ ($WM_PKG_SES) ]] && inpkg+="$WM_BASE_PKGS "
 
 	# update and install crucial packages first to avoid issues
-	al_repo "$MNT/etc/pacman.conf"
-	chrun "pacman -Syyu $BASE_PKGS ${LOGIN_PKGS[$LOGIN_TYPE]} $NEWSHELL --noconfirm --needed" 2> "$ERR" 2>&1
-	errshow 1 "chrun 'pacman -Syyu $BASE_PKGS ${LOGIN_PKGS[$LOGIN_TYPE]} $NEWSHELL --noconfirm --needed'"
+	chrun "pacman -Syyu --noconfirm" 2> "$ERR" 2>&1
+	chrun "pacman -S ${LOGIN_PKGS[$LOGIN_TYPE]} $NEWSHELL $UCODE $KERNEL --noconfirm --needed" 2> "$ERR" 2>&1
+	errshow 1 "chrun 'pacman -S ${LOGIN_PKGS[$LOGIN_TYPE]} $NEWSHELL $UCODE $KERNEL --noconfirm --needed'"
 
 	# remove the packages we don't want on the installed system
 	[[ $rmpkg ]] && chrun "pacman -Rnsc $rmpkg --noconfirm"
 
-	# reinstalling iputils fixes the network issue for non-root users
-	chrun "pacman -S iputils $UCODE $KERNEL --noconfirm"
-
 	# install the packages chosen throughout the install
 	chrun "pacman -S $inpkg --needed --noconfirm" 2> "$ERR" 2>&1
 	errshow 1 "chrun 'pacman -S $inpkg --needed --noconfirm'"
@@ -1647,10 +1640,9 @@ install_mirrorlist()
 install_background()
 {
 	(
-		rsync -a /run/archiso/sfs/airootfs/ "$MNT/" &&
-		install_mirrorlist "$MNT/etc/pacman.d/mirrorlist" > /tmp/bgout 2>&1 &&
-		al_repo "$MNT/etc/pacman.conf" &&
-		chrun "pacman -Syyu $BASE_PKGS --noconfirm --needed" > /tmp/bgout 2>&1
+		install_mirrorlist "/etc/pacman.d/mirrorlist" > /tmp/bgout 2>&1 &&
+		pacstrap /mnt $BASE_PKGS > /tmp/bgout 2>&1 &&
+		al_repo "$MNT/etc/pacman.conf"
 	) &
 	BG_PID=$!
 	# shellcheck disable=SC2064