diff options
| author | Luca Boccassi <bluca@debian.org> | 2018-06-01 14:29:05 +0100 |
|---|---|---|
| committer | Luca Boccassi <bluca@debian.org> | 2018-06-03 22:06:36 +0100 |
| commit | e5492b1c702858eb26e2b93c65810773ad0bfa85 (patch) | |
| tree | b4149dcbc1ea8220b60159ee0fdb68f34d570c97 | |
| parent | 186765e3fd905a2ecd08cd22dd9afdcc581b1d0a (diff) | |
| download | vyos-live-build-e5492b1c702858eb26e2b93c65810773ad0bfa85.tar.gz vyos-live-build-e5492b1c702858eb26e2b93c65810773ad0bfa85.zip | |
Avoid apt-key add and just drop the key in /etc/apt/trusted.gpg.d
Only gnupgv is part of the deboostrap set these days, but apt-key needs
the full gpg (with gpg-agent) which is just a recommends.
Instead just drop the key with an .asc suffix in /etc/apt/trusted.gpg.d
which is supported since apt version 1.4
| -rwxr-xr-x | scripts/build/bootstrap_archives | 4 | ||||
| -rwxr-xr-x | scripts/build/chroot_archives | 8 |
2 files changed, 3 insertions, 9 deletions
diff --git a/scripts/build/bootstrap_archives b/scripts/build/bootstrap_archives index f7bf7d8c4..a5eca16a0 100755 --- a/scripts/build/bootstrap_archives +++ b/scripts/build/bootstrap_archives @@ -222,9 +222,7 @@ then do if [ -e "${FILE}" ] then - cp ${FILE} chroot/root - Chroot chroot "apt-key add /root/$(basename ${FILE})" - rm -f chroot/root/$(basename ${FILE}) + cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).asc fi done fi diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives index 596fafc57..2332388ba 100755 --- a/scripts/build/chroot_archives +++ b/scripts/build/chroot_archives @@ -353,9 +353,7 @@ EOF do if [ -e "${FILE}" ] then - cp ${FILE} chroot/root - Chroot chroot "apt-key add /root/$(basename ${FILE})" - rm -f chroot/root/$(basename ${FILE}) + cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).asc fi done fi @@ -637,9 +635,7 @@ EOF do if [ -e "${FILE}" ] then - cp ${FILE} chroot/root - Chroot chroot "apt-key add /root/$(basename ${FILE})" - rm -f chroot/root/$(basename ${FILE}) + cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).asc fi done |