diff --git a/usr/bin/archboot-aarch64-release.sh b/usr/bin/archboot-aarch64-release.sh index cf0c7a633..4a38a4a1c 100755 --- a/usr/bin/archboot-aarch64-release.sh +++ b/usr/bin/archboot-aarch64-release.sh @@ -2,7 +2,7 @@ # created by Tobias Powalowski source /usr/lib/archboot/functions source /usr/lib/archboot/release_functions -export _ARCHBOOT="archboot-arm" +_ARCHBOOT="archboot-arm" [[ -z "${1}" ]] && _usage _root_check _aarch64_check @@ -12,4 +12,3 @@ _create_boot _create_torrent _create_cksum echo "Finished release creation in ${1} ." -unset _ARCHBOOT diff --git a/usr/bin/archboot-x86_64-release.sh b/usr/bin/archboot-x86_64-release.sh index 6567ac21a..606f73c9f 100755 --- a/usr/bin/archboot-x86_64-release.sh +++ b/usr/bin/archboot-x86_64-release.sh @@ -2,8 +2,7 @@ # created by Tobias Powalowski source /usr/lib/archboot/functions source /usr/lib/archboot/release_functions -export $1 -export _ARCHBOOT="archboot" +_ARCHBOOT="archboot" [[ -z "${1}" ]] && _usage _root_check _x86_64_check @@ -13,5 +12,4 @@ _create_boot _create_torrent _create_cksum echo "Finished release creation in ${1} ." -unset _ARCHBOOT -unset $1 + diff --git a/usr/lib/archboot/functions b/usr/lib/archboot/functions index 787dbd351..0ca2004b3 100644 --- a/usr/lib/archboot/functions +++ b/usr/lib/archboot/functions @@ -48,6 +48,6 @@ _generate_locales() { _generate_keyring() { # generate pacman keyring echo "Generate pacman keyring in container ..." - systemd-nspawn -D "${_DIR}" pacman-key --init >/dev/null 2>&1 - systemd-nspawn -D "${_DIR}" pacman-key --populate "${_KEYRING}" >/dev/null 2>&1 + systemd-nspawn -q -D "${_DIR}" pacman-key --init >/dev/null 2>&1 + systemd-nspawn -q -D "${_DIR}" pacman-key --populate "${_KEYRING}" >/dev/null 2>&1 }