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 aarch64 mkinitcpio

Browse source
This commit is contained in:
Tobias Powalowski 2023-10-16 16:47:48 +02:00
parent ab83dff6e0
commit 4873754939
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
usr/lib/archboot/container.sh
View file

@ -140,22 +140,27 @@ _umount_special() {
} }
_install_base_packages() { _install_base_packages() {
if [[ "${_ARCH}" == "aarch64" ]]; then
_MKINITCPIO="mkinitcpio\=99"
else
_MKINITCPIO=initramfs
fi
if [[ "${2}" == "use_binfmt" ]]; then if [[ "${2}" == "use_binfmt" ]]; then
echo "Downloading ${_KEYRING} ${_PACKAGES} to ${1}..." echo "Downloading ${_KEYRING} ${_PACKAGES} to ${1}..."
if grep -q 'archboot' /etc/hostname; then if grep -q 'archboot' /etc/hostname; then
#shellcheck disable=SC2086 #shellcheck disable=SC2086
${_PACMAN} -Syw --assume-installed initramfs ${_KEYRING} ${_PACKAGES} ${_PACMAN_DEFAULTS} ${_PACMAN_DB} &>"${_LOG}" || exit 1 ${_PACMAN} -Syw --assume-installed ${_MKINITCPIO} ${_KEYRING} ${_PACKAGES} ${_PACMAN_DEFAULTS} ${_PACMAN_DB} &>"${_LOG}" || exit 1
else else
#shellcheck disable=SC2086 #shellcheck disable=SC2086
${_PACMAN} -Syw --assume-installed initramfs ${_KEYRING} ${_PACKAGES} ${_PACMAN_DEFAULTS} ${_PACMAN_DB} &>"${_NO_LOG}" || exit 1 ${_PACMAN} -Syw --assume-installed ${_MKINITCPIO} ${_KEYRING} ${_PACKAGES} ${_PACMAN_DEFAULTS} ${_PACMAN_DB} &>"${_NO_LOG}" || exit 1
fi fi
fi fi
echo "Installing ${_KEYRING} ${_PACKAGES} to ${1}..." echo "Installing ${_KEYRING} ${_PACKAGES} to ${1}..."
if grep -q 'archboot' /etc/hostname; then if grep -q 'archboot' /etc/hostname; then
${_PACMAN} -Sy --assume-installed initramfs ${_KEYRING} ${_PACKAGES} ${_PACMAN_DEFAULTS} &>"${_LOG}" || exit 1 ${_PACMAN} -Sy --assume-installed ${_MKINITCPIO} ${_KEYRING} ${_PACKAGES} ${_PACMAN_DEFAULTS} &>"${_LOG}" || exit 1
else else
#shellcheck disable=SC2086 #shellcheck disable=SC2086
${_PACMAN} -Sy --assume-installed initramfs ${_KEYRING} ${_PACKAGES} ${_PACMAN_DEFAULTS} &>"${_NO_LOG}" || exit 1 ${_PACMAN} -Sy --assume-installed ${_MKINITCPIO} ${_KEYRING} ${_PACKAGES} ${_PACMAN_DEFAULTS} &>"${_NO_LOG}" || exit 1
fi fi
} }

7
usr/lib/archboot/update/manage.sh
View file

@ -315,12 +315,17 @@ _full_system() {
_PACKAGES="$(pacman -Qqn)" _PACKAGES="$(pacman -Qqn)"
_COUNT=0 _COUNT=0
_PACKAGE_COUNT="$(pacman -Qqn | wc -l)" _PACKAGE_COUNT="$(pacman -Qqn | wc -l)"
if [[ "${_RUNNING_ARCH}" == "aarch64" ]]; then
_MKINITCPIO="mkinitcpio\=99"
else
_MKINITCPIO="initramfs"
fi
for i in ${_PACKAGES}; do for i in ${_PACKAGES}; do
if [[ "$((_COUNT*100/_PACKAGE_COUNT-4))" -gt 1 ]]; then if [[ "$((_COUNT*100/_PACKAGE_COUNT-4))" -gt 1 ]]; then
_progress "$((_COUNT*100/_PACKAGE_COUNT-4))" "Reinstalling all packages, installing ${i} now..." _progress "$((_COUNT*100/_PACKAGE_COUNT-4))" "Reinstalling all packages, installing ${i} now..."
fi fi
#shellcheck disable=SC2086 #shellcheck disable=SC2086
pacman -S --noconfirm ${i} --assume-installed initramfs >"${_LOG}" 2>&1 || exit 1 pacman -S --assume-installed ${_MKINITCPIO} --noconfirm ${i} >"${_LOG}" 2>&1 || exit 1
_COUNT="$((_COUNT+1))" _COUNT="$((_COUNT+1))"
done done
: >/tmp/{60-mkinitcpio-remove.hook,90-mkinitcpio-install.hook} : >/tmp/{60-mkinitcpio-remove.hook,90-mkinitcpio-install.hook}