root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix

Browse source
This commit is contained in:
Tobias Powalowski 2022-05-14 13:41:23 +02:00
parent 9325d54810
commit d6aa8766b9
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
usr/lib/archboot/update-installer.sh
View file

@ -210,7 +210,7 @@ _create_initramfs() {
_kexec() { _kexec() {
# load kernel and initrds into running kernel in background mode! # load kernel and initrds into running kernel in background mode!
kexec -l /"${VMLINUZ}" --initrd="/initrd.img" --reuse-cmdline& kexec -l /"${VMLINUZ}" --initrd="/initrd.img" --reuse-cmdline&
# wait 2 seconds for getting a complete initramfs # wait 3 seconds for getting a complete initramfs
# remove kernel and initrd to save RAM for kexec in background # remove kernel and initrd to save RAM for kexec in background
sleep 2 sleep 2
rm /{initrd.img,${VMLINUZ}} rm /{initrd.img,${VMLINUZ}}
@ -258,11 +258,8 @@ _prepare_xfce() {
echo "Running pacman to install packages: ${_FULL_PACKAGES} ${_X_PACKAGES} ..." echo "Running pacman to install packages: ${_FULL_PACKAGES} ${_X_PACKAGES} ..."
_INSTALL_SOURCE="file:///var/cache/pacman/pkg" _INSTALL_SOURCE="file:///var/cache/pacman/pkg"
_create_pacman_conf _create_pacman_conf
pacman -Sy --config ${_PACMAN_CONF} >/dev/null 2>&1 || exit 1
# workaround unsolvable zstd bug,
# booting with higher memory results in not having /var/lib/pacman/local/zstd-*
#shellcheck disable=SC2086 #shellcheck disable=SC2086
pacman -S zstd --config ${_PACMAN_CONF} --noconfirm --overwrite '*' >/dev/null 2>&1 || exit 1 pacman -Sy --config ${_PACMAN_CONF} >/dev/null 2>&1 || exit 1
for i in ${_XORG}; do for i in ${_XORG}; do
#shellcheck disable=SC2086 #shellcheck disable=SC2086
pacman -S ${i} --config ${_PACMAN_CONF} --noconfirm >/dev/null 2>&1 || exit 1 pacman -S ${i} --config ${_PACMAN_CONF} --noconfirm >/dev/null 2>&1 || exit 1
@ -276,10 +273,6 @@ _prepare_xfce() {
_IGNORE="${_IGNORE} --ignore ${i}" _IGNORE="${_IGNORE} --ignore ${i}"
done done
fi fi
# workaround unsolvable zstd bug,
# booting with higher memory results in not having /var/lib/pacman/local/zstd-*
#shellcheck disable=SC2086
pacman -Sy zstd --noconfirm --overwrite '*' >/dev/null 2>&1 || exit 1
#shellcheck disable=SC2086 #shellcheck disable=SC2086
pacman -Syu ${_IGNORE} --noconfirm >/dev/null 2>&1 || exit 1 pacman -Syu ${_IGNORE} --noconfirm >/dev/null 2>&1 || exit 1
_cleanup_install _cleanup_install