Verified Commit 960b988a authored by David Runge's avatar David Runge 🐿
Browse files

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
parents a9a4dc4f 62e74c7e
......@@ -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"
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
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[@]}"
if [[ -n "${gpg_key}" ]]; then
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment