Merge remote-tracking branch 'nl6720/gpg-sender'

* nl6720/gpg-sender:
  .gitlab/ci/build_archiso.sh: use mkarchiso's -G option
This commit is contained in:
David Runge 2021-09-05 16:52:21 +02:00
commit 357009ee87
No known key found for this signature in database
GPG Key ID: 7258734B41C31549
1 changed files with 3 additions and 0 deletions

View File

@ -206,6 +206,8 @@ EOF
| awk -F':' '{if($1 ~ /sec/){ print $5 }}'
)"
pgp_sender="Arch Linux Release Engineering (Ephemeral Signing Key) <arch-releng@lists.archlinux.org>"
print_section_end "ephemeral_pgp_key"
}
@ -316,6 +318,7 @@ run_mkarchiso() {
-D "${install_dir}" \
-c "${codesigning_cert} ${codesigning_key}" \
-g "${pgp_key_id}" \
-G "${pgp_sender}" \
-o "${output}/" \
-w "${tmpdir}/" \
-m "iso netboot bootstrap" \