From 25c209892ae957bf52f428bf4885411e1771d477 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Wed, 9 Feb 2022 08:31:10 +0100 Subject: [PATCH] correct initramfs rm --- usr/bin/archboot-x86_64-release.sh | 2 ++ usr/lib/archboot/container_functions | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/usr/bin/archboot-x86_64-release.sh b/usr/bin/archboot-x86_64-release.sh index da210ac9c..6567ac21a 100755 --- a/usr/bin/archboot-x86_64-release.sh +++ b/usr/bin/archboot-x86_64-release.sh @@ -2,6 +2,7 @@ # created by Tobias Powalowski source /usr/lib/archboot/functions source /usr/lib/archboot/release_functions +export $1 export _ARCHBOOT="archboot" [[ -z "${1}" ]] && _usage _root_check @@ -13,3 +14,4 @@ _create_torrent _create_cksum echo "Finished release creation in ${1} ." unset _ARCHBOOT +unset $1 diff --git a/usr/lib/archboot/container_functions b/usr/lib/archboot/container_functions index c494ababb..cef69505f 100644 --- a/usr/lib/archboot/container_functions +++ b/usr/lib/archboot/container_functions @@ -65,7 +65,7 @@ _cleanmkinitcpio() { echo "Clean mkinitcpio from ${_DIR} ..." [[ -e "${_DIR}/usr/share/libalpm/hooks/60-mkinitcpio-remove.hook" ]] && rm "${_DIR}/usr/share/libalpm/hooks/60-mkinitcpio-remove.hook" [[ -e "${_DIR}/usr/share/libalpm/hooks/90-mkinitcpio-install.hook" ]] && rm "${_DIR}/usr/share/libalpm/hooks/90-mkinitcpio-install.hook" - [[ -e "${_DIR}/boot/{initramfs-linux.img" ]] && rm "${_DIR}/boot/initramfs-linux.img" + [[ -e "${_DIR}/boot/initramfs-linux.img" ]] && rm "${_DIR}/boot/initramfs-linux.img" [[ -e "${_DIR}/boot/initramfs-linux-fallback.img" ]] && rm "${_DIR}/boot/initramfs-linux-fallback.img" }