diff options
| -rw-r--r-- | archives/live.debian.net.key (renamed from archives/live.debian.net.gpg) | 0 | ||||
| -rwxr-xr-x | scripts/build/lb_chroot_archives | 28 |
2 files changed, 14 insertions, 14 deletions
diff --git a/archives/live.debian.net.gpg b/archives/live.debian.net.key index d03e3259f..d03e3259f 100644 --- a/archives/live.debian.net.gpg +++ b/archives/live.debian.net.key diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives index d06581d3b..b85b70883 100755 --- a/scripts/build/lb_chroot_archives +++ b/scripts/build/lb_chroot_archives @@ -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})" |