diff options
| author | Marcel Partap <mpartap@gmx.net> | 2018-09-12 18:00:20 +0200 |
|---|---|---|
| committer | Luca Boccassi <bluca@debian.org> | 2018-09-13 16:25:09 +0100 |
| commit | 8403487d4e3bda65cdd2ea6081399f7977325adb (patch) | |
| tree | 3f0a6f83448f1c49b287e63ba32ca4b960aff1f6 | |
| parent | 52908422880f8d5cfa18c577d4138d5449af37f6 (diff) | |
| download | vyos-live-build-8403487d4e3bda65cdd2ea6081399f7977325adb.tar.gz vyos-live-build-8403487d4e3bda65cdd2ea6081399f7977325adb.zip | |
copy keys to /etc/apt/trusted.gpg.d with appropriate extension for them to not be ignored.
| -rwxr-xr-x | scripts/build/bootstrap_archives | 7 | ||||
| -rwxr-xr-x | scripts/build/chroot_archives | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/scripts/build/bootstrap_archives b/scripts/build/bootstrap_archives index a5eca16a0..9e94680eb 100755 --- a/scripts/build/bootstrap_archives +++ b/scripts/build/bootstrap_archives @@ -222,7 +222,12 @@ then do if [ -e "${FILE}" ] then - cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).asc + if grep -q "PGP PUBLIC KEY BLOCK" "${FILE}" + then + cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).asc + else + cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).gpg + fi fi done fi diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives index 2332388ba..11a5c4a80 100755 --- a/scripts/build/chroot_archives +++ b/scripts/build/chroot_archives @@ -353,7 +353,12 @@ EOF do if [ -e "${FILE}" ] then - cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).asc + if grep -q "PGP PUBLIC KEY BLOCK" "${FILE}" + then + cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).asc + else + cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).gpg + fi fi done fi |