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

copy keys to /etc/apt/trusted.gpg.d with appropriate extension for them to not be ignored.

This commit is contained in:
Marcel Partap 2018-09-12 18:00:20 +02:00 committed by Luca Boccassi
parent 5290842288
commit 8403487d4e
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/build/bootstrap_archives
View File

@ -222,7 +222,12 @@ then
do do
if [ -e "${FILE}" ] if [ -e "${FILE}" ]
then 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 fi
done done
fi fi

7
scripts/build/chroot_archives
View File

@ -353,7 +353,12 @@ EOF
do do
if [ -e "${FILE}" ] if [ -e "${FILE}" ]
then 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 fi
done done
fi fi