From 1d1edf0ce2c14576bc75a3c9b0d11db633e8b697 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Sat, 5 Feb 2022 10:28:47 +0100 Subject: [PATCH] fix initramfs cleanup --- usr/bin/archboot-aarch64-create-container.sh | 4 ++-- usr/bin/archboot-x86_64-create-container.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/usr/bin/archboot-aarch64-create-container.sh b/usr/bin/archboot-aarch64-create-container.sh index 046d70c42..8a30e380f 100755 --- a/usr/bin/archboot-aarch64-create-container.sh +++ b/usr/bin/archboot-aarch64-create-container.sh @@ -78,7 +78,7 @@ if [[ "$(uname -m)" == "aarch64" ]]; then # install archboot echo "Installing packages base linux and ${_LINUX_FIRMWARE} to ${_DIR} ..." pacman --root "${_DIR}" -Sy base linux "${_LINUX_FIRMWARE}" --ignore systemd-resolvconf --noconfirm --cachedir "${_PWD}"/"${_CACHEDIR}" >/dev/null 2>&1 - rm "${_DIR}"/boot/{initramfs-linux.img,initramfs-linux-fallback.img} + rm ${_DIR}/boot/{initramfs-linux.img,initramfs-linux-fallback.img} cleancache echo "Installing archboot to ${_DIR} ..." pacman --root "${_DIR}" -Sy archboot-arm --ignore systemd-resolvconf --noconfirm >/dev/null 2>&1 @@ -124,7 +124,7 @@ if [[ "$(uname -m)" == "x86_64" ]]; then systemd-nspawn -D "${_DIR}" pacman -Syu --noconfirm >/dev/null 2>&1 echo "Installing archboot-arm and ${_LINUX_FIRMWARE} to container..." systemd-nspawn -D "${_DIR}" /bin/bash -c "pacman -S archboot-arm ${_LINUX_FIRMWARE} --noconfirm" >/dev/null 2>&1 - rm "${_DIR}"/boot/{initramfs-linux.img,initramfs-linux-fallback.img} + rm ${_DIR}/boot/{initramfs-linux.img,initramfs-linux-fallback.img} cleancache saveram [[ "${_SAVE_RAM}" == "1" ]] && rm -r "${_DIR}"/usr/share/{i18n,locale} diff --git a/usr/bin/archboot-x86_64-create-container.sh b/usr/bin/archboot-x86_64-create-container.sh index dc0e075f0..21a141188 100755 --- a/usr/bin/archboot-x86_64-create-container.sh +++ b/usr/bin/archboot-x86_64-create-container.sh @@ -59,7 +59,7 @@ mount shm "${_DIR}/dev/shm" -t tmpfs -o mode=1777,nosuid,nodev # install archboot echo "Installing packages base linux and ${_LINUX_FIRMWARE} to ${_DIR} ..." pacman --root "${_DIR}" -Sy base linux "${_LINUX_FIRMWARE}" --ignore systemd-resolvconf --noconfirm --cachedir "${_PWD}"/"${_CACHEDIR}" >/dev/null 2>&1 -rm "${_DIR}"/boot/{initramfs-linux.img,initramfs-linux-fallback.img} +rm ${_DIR}/boot/{initramfs-linux.img,initramfs-linux-fallback.img} if [[ "${_CLEANUP_CACHE}" == "1" ]]; then # clean cache echo "Clean pacman cache from ${_DIR} ..."