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

Fix: bg install failing with pacman, add fallback

Browse Source
This commit is contained in:
natemaia 2019-08-17 21:10:51 -07:00
parent 910a8a476b
commit 94230d70ba
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archlabs-installer
View File

@ -1578,6 +1578,8 @@ install_packages()
local rmpkg="" local rmpkg=""
local inpkg="$PACKAGES $USER_PKGS" local inpkg="$PACKAGES $USER_PKGS"
[[ -x $MNT/usr/bin/X ]] || inpkg+=" $BASE_PKGS"
if pacman -Qsq 'archlabs-installer' >/dev/null 2>&1; then if pacman -Qsq 'archlabs-installer' >/dev/null 2>&1; then
rmpkg+=" archlabs-installer" rmpkg+=" archlabs-installer"
elif [[ -e "$MNT/usr/bin/archlabs-installer" ]]; then elif [[ -e "$MNT/usr/bin/archlabs-installer" ]]; then
@ -1706,7 +1708,7 @@ install_background()
yesno "Background Install" "\nBegin install in the background?\n" || return 0 yesno "Background Install" "\nBegin install in the background?\n" || return 0
rsync -a /run/archiso/sfs/airootfs/ $MNT/ & rsync -a /run/archiso/sfs/airootfs/ $MNT/ &
RSYNC_PID=$! RSYNC_PID=$!
( install_mirrorlist "$MNT/etc/pacman.d/mirrorlist"; chrun "pacman -Syyu $BASE_PKGS --needed --noconfirm" >> /tmp/bg_out 2>&1 ) & ( install_mirrorlist "$MNT/etc/pacman.d/mirrorlist" && sleep 1 && mkdir -p $MNT/var/lib/pacman && chrun "pacman -Syyu $BASE_PKGS --needed --noconfirm" >> /tmp/bg_out 2>&1 ) &
MIRROR_PID=$! MIRROR_PID=$!
# end the background processes before exiting # end the background processes before exiting
trap "kill $RSYNC_PID $MIRROR_PID 2>/dev/null" EXIT trap "kill $RSYNC_PID $MIRROR_PID 2>/dev/null" EXIT