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:
commit
357009ee87
|
@ -206,6 +206,8 @@ EOF
|
||||||
| awk -F':' '{if($1 ~ /sec/){ print $5 }}'
|
| 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"
|
print_section_end "ephemeral_pgp_key"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -316,6 +318,7 @@ run_mkarchiso() {
|
||||||
-D "${install_dir}" \
|
-D "${install_dir}" \
|
||||||
-c "${codesigning_cert} ${codesigning_key}" \
|
-c "${codesigning_cert} ${codesigning_key}" \
|
||||||
-g "${pgp_key_id}" \
|
-g "${pgp_key_id}" \
|
||||||
|
-G "${pgp_sender}" \
|
||||||
-o "${output}/" \
|
-o "${output}/" \
|
||||||
-w "${tmpdir}/" \
|
-w "${tmpdir}/" \
|
||||||
-m "iso netboot bootstrap" \
|
-m "iso netboot bootstrap" \
|
||||||
|
|
Loading…
Reference in a new issue