manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Luca Boccassi 2018-06-01 14:29:05 +01:00
parent 186765e3fd
commit e5492b1c70
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/build/bootstrap_archives
View File

@ -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

8
scripts/build/chroot_archives
View File

@ -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