faerbit/archiso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'nl6720/ARCHISO_GNUPG_FD-unbound-variable'

Browse Source 
* nl6720/ARCHISO_GNUPG_FD-unbound-variable:
  mkarchiso: fix unbound variable when not using GPG signing
This commit is contained in:
David Runge 2021-06-05 11:38:29 +02:00
commit 960b988ac6
No known key found for this signature in database
GPG Key ID: 7258734B41C31549
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
archiso/mkarchiso
View File

@ -320,16 +320,18 @@ _make_custom_airootfs() {
# Install desired packages to airootfs # Install desired packages to airootfs
_make_packages() { _make_packages() {
local envvars_in_chroot=()
_msg_info "Installing packages to '${pacstrap_dir}/'..." _msg_info "Installing packages to '${pacstrap_dir}/'..."
if [[ -n "${gpg_key}" ]]; then if [[ -n "${gpg_key}" ]]; then
exec {ARCHISO_GNUPG_FD}<>"${work_dir}/pubkey.gpg" exec {ARCHISO_GNUPG_FD}<>"${work_dir}/pubkey.gpg"
envvars_in_chroot+=("ARCHISO_GNUPG_FD=${ARCHISO_GNUPG_FD}")
fi fi
if [[ "${quiet}" = "y" ]]; then 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 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 fi
if [[ -n "${gpg_key}" ]]; then if [[ -n "${gpg_key}" ]]; then