xstefen/al-installer
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change to using pacstrap for base install to avoid issues.

Browse Source
This commit is contained in:
natemaia 2020-04-18 11:26:05 -07:00
parent 516881ae41
commit 26eaf5d858
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
archlabs-installer
View File

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