diff options
| author | David Runge <dvzrv@archlinux.org> | 2021-06-05 11:38:29 +0200 |
|---|---|---|
| committer | David Runge <dvzrv@archlinux.org> | 2021-06-05 11:38:29 +0200 |
| commit | 960b988ac6dc962c94bb020aac7fe9a85874aa38 (patch) | |
| tree | 0cfbcb9a8e9589cc5cc40d1e746cf72d185dd41e | |
| parent | a9a4dc4f70cf9527ffab493f55be01b1d171b385 (diff) | |
| parent | 62e74c7e7954756b8653f0edb679eb970a4b49a4 (diff) | |
| download | archiso-960b988ac6dc962c94bb020aac7fe9a85874aa38.tar.gz archiso-960b988ac6dc962c94bb020aac7fe9a85874aa38.tar.bz2 | |
Merge remote-tracking branch 'nl6720/ARCHISO_GNUPG_FD-unbound-variable'
* nl6720/ARCHISO_GNUPG_FD-unbound-variable:
mkarchiso: fix unbound variable when not using GPG signing
| -rwxr-xr-x | archiso/mkarchiso | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/archiso/mkarchiso b/archiso/mkarchiso index 10daa6e..685ad43 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -320,16 +320,18 @@ _make_custom_airootfs() { # Install desired packages to airootfs _make_packages() { + local envvars_in_chroot=() _msg_info "Installing packages to '${pacstrap_dir}/'..." if [[ -n "${gpg_key}" ]]; then exec {ARCHISO_GNUPG_FD}<>"${work_dir}/pubkey.gpg" + envvars_in_chroot+=("ARCHISO_GNUPG_FD=${ARCHISO_GNUPG_FD}") fi if [[ "${quiet}" = "y" ]]; then - env -i "ARCHISO_GNUPG_FD=${ARCHISO_GNUPG_FD}" pacstrap -C "${work_dir}/${buildmode}.pacman.conf" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}" &> /dev/null + env -i "${envvars_in_chroot[@]}" pacstrap -C "${work_dir}/${buildmode}.pacman.conf" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}" &> /dev/null else - env -i "ARCHISO_GNUPG_FD=${ARCHISO_GNUPG_FD}" pacstrap -C "${work_dir}/${buildmode}.pacman.conf" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}" + env -i "${envvars_in_chroot[@]}" pacstrap -C "${work_dir}/${buildmode}.pacman.conf" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}" fi if [[ -n "${gpg_key}" ]]; then |