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

Changing archives key suffix from .gpg to .key.

This commit is contained in:
Daniel Baumann 2011-06-15 21:21:41 +02:00
parent 535051e43d
commit 2312f18ef1
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
archives/live.debian.net.gpg → archives/live.debian.net.key
View File

28
scripts/build/lb_chroot_archives
View File

@ -236,12 +236,12 @@ EOF
if [ "${LB_APT_SECURE}" != false ]
then
# Adding archive signing keys (chroot)
if [ -e "${LB_BASE}/archives/${REPOSITORY}.chroot.gpg" ]
if [ -e "${LB_BASE}/archives/${REPOSITORY}.chroot.key" ]
then
cat "${LB_BASE}/archives/${REPOSITORY}.chroot.gpg" | Chroot chroot "apt-key add -"
elif [ -e "${LB_BASE}/archives/${REPOSITORY}.gpg" ]
cat "${LB_BASE}/archives/${REPOSITORY}.chroot.key" | Chroot chroot "apt-key add -"
elif [ -e "${LB_BASE}/archives/${REPOSITORY}.key" ]
then
cat "${LB_BASE}/archives/${REPOSITORY}.gpg" | Chroot chroot "apt-key add -"
cat "${LB_BASE}/archives/${REPOSITORY}.key" | Chroot chroot "apt-key add -"
fi
fi
done
@ -457,10 +457,10 @@ EOF
Chroot chroot "apt-get ${APT_OPTIONS} install aptitude"
fi
else # Get fresh indices
# Check local gpg keys
if Find_files config/archives/*.chroot.gpg
# Check local archive keys
if Find_files config/archives/*.chroot.key
then
for FILE in config/archives/*.chroot.gpg
for FILE in config/archives/*.chroot.key
do
cp ${FILE} chroot/root
Chroot chroot "apt-key add /root/$(basename ${FILE})"
@ -755,12 +755,12 @@ EOF
if [ "${LB_APT_SECURE}" != false ]
then
# Adding archive signing keys (binary)
if [ -e "${LB_BASE}/archives/${REPOSITORY}.binary.gpg" ]
if [ -e "${LB_BASE}/archives/${REPOSITORY}.binary.key" ]
then
cat "${LB_BASE}/archives/${REPOSITORY}.binary.gpg" | Chroot chroot "apt-key add -"
elif [ -e "${LB_BASE}/archives/${REPOSITORY}.gpg" ]
cat "${LB_BASE}/archives/${REPOSITORY}.binary.key" | Chroot chroot "apt-key add -"
elif [ -e "${LB_BASE}/archives/${REPOSITORY}.key" ]
then
cat "${LB_BASE}/archives/${REPOSITORY}.gpg" | Chroot chroot "apt-key add -"
cat "${LB_BASE}/archives/${REPOSITORY}.key" | Chroot chroot "apt-key add -"
fi
fi
done
@ -779,10 +779,10 @@ EOF
done
fi
# Check local gpg keys
if Find_files config/archives/*.binary.gpg
# Check local archive keys
if Find_files config/archives/*.binary.key
then
for FILE in config/archives/*.binary.gpg
for FILE in config/archives/*.binary.key
do
cp ${FILE} chroot/root
Chroot chroot "apt-key add /root/$(basename ${FILE})"