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 weird zstd package missing bug

Browse source
This commit is contained in:
Tobias Powalowski 2022-05-14 12:01:07 +02:00
parent 6321bddfe4
commit 013333355a
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -200,9 +200,9 @@ _create_initramfs() {
sleep 2
for i in $(find . -mindepth 1 -type f | sort); do
rm "${i}" >/dev/null 2>&1
sleep 0.01
sleep 0.002
done
while pgrep -x bsdtar >/dev/null 2>&1; do
while pgrep -x zstd >/dev/null 2>&1; do
sleep 1
done
}
@ -258,6 +258,8 @@ _prepare_xfce() {
echo "Running pacman to install packages: ${_FULL_PACKAGES} ${_X_PACKAGES} ..."
_INSTALL_SOURCE="file:///var/cache/pacman/pkg"
_create_pacman_conf
#fix unsolvable zstd bug
pacman -Sy zstd --config ${_PACMAN_CONF} -overwrite '*' >/dev/null 2>&1 || exit 1
#shellcheck disable=SC2086
pacman -Sy --config ${_PACMAN_CONF} >/dev/null 2>&1 || exit 1
for i in ${_XORG}; do
@ -273,6 +275,7 @@ _prepare_xfce() {
_IGNORE="${_IGNORE} --ignore ${i}"
done
fi
pacman -Sy zstd --noconfirm -overwrite '*' >/dev/null 2>&1
#shellcheck disable=SC2086
pacman -Syu ${_IGNORE} --noconfirm >/dev/null 2>&1 || exit 1
_cleanup_install