diff --git a/usr/lib/archboot/container.sh b/usr/lib/archboot/container.sh index e4cc7f7b2..78d8746fd 100644 --- a/usr/lib/archboot/container.sh +++ b/usr/lib/archboot/container.sh @@ -140,22 +140,27 @@ _umount_special() { } _install_base_packages() { + if [[ "${_ARCH}" == "aarch64" ]]; then + _MKINITCPIO="mkinitcpio\=99" + else + _MKINITCPIO=initramfs + fi if [[ "${2}" == "use_binfmt" ]]; then - echo "Downloading ${_KEYRING} ${_PACKAGES} to ${1}..." + echo "Downloading ${_KEYRING} ${_PACKAGES} to ${1}..." if grep -q 'archboot' /etc/hostname; then #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 #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 echo "Installing ${_KEYRING} ${_PACKAGES} to ${1}..." 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 #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 } diff --git a/usr/lib/archboot/update/manage.sh b/usr/lib/archboot/update/manage.sh index 03d162dc9..71e436e7e 100644 --- a/usr/lib/archboot/update/manage.sh +++ b/usr/lib/archboot/update/manage.sh @@ -315,12 +315,17 @@ _full_system() { _PACKAGES="$(pacman -Qqn)" _COUNT=0 _PACKAGE_COUNT="$(pacman -Qqn | wc -l)" + if [[ "${_RUNNING_ARCH}" == "aarch64" ]]; then + _MKINITCPIO="mkinitcpio\=99" + else + _MKINITCPIO="initramfs" + fi for i in ${_PACKAGES}; do if [[ "$((_COUNT*100/_PACKAGE_COUNT-4))" -gt 1 ]]; then _progress "$((_COUNT*100/_PACKAGE_COUNT-4))" "Reinstalling all packages, installing ${i} now..." fi #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))" done : >/tmp/{60-mkinitcpio-remove.hook,90-mkinitcpio-install.hook}