summaryrefslogtreecommitdiffstats
path: root/share/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'share/scripts')
-rwxr-xr-xshare/scripts/debconf16
1 files changed, 4 insertions, 12 deletions
diff --git a/share/scripts/debconf b/share/scripts/debconf
index f463123..4878d98 100755
--- a/share/scripts/debconf
+++ b/share/scripts/debconf
@@ -330,15 +330,7 @@ EOF
esac
# Import archive keys
- case "${DISTRIBUTION}" in
- *-backports)
- KEYS="project/pgp/archive-key-${DIST}.asc project/pgp/archive-key-${DIST}-backports.asc"
- ;;
-
- *)
- KEYS="project/pgp/archive-key-${DIST}.asc"
- ;;
- esac
+ KEYS="project/pgp/archive-key-${DIST}.asc"
for KEY in ${KEYS}
do
@@ -346,7 +338,7 @@ EOF
echo "P: Fetching archive-key ${KEY_NAME}..."
wget -q "${MIRROR}/${KEY}" -O "${DIRECTORY}/key.asc"
- wget -q "${MIRROR}/${KEY}.sig" -O "${DIRECTORY}/key.asc.sig"
+ wget -q "${MIRROR}/${KEY}.gpg" -O "${DIRECTORY}/key.asc.gpg"
if [ -e /usr/bin/gpgv ]
then
@@ -361,7 +353,7 @@ EOF
echo -n "I: Verifying archive-key ${KEY_NAME} against $(basename ${KEYRING} .gpg | sed -e 's|-keyring||') keyring..."
# FIXME: doesn't work anymore when the template eventually be run with 'set -e'
- /usr/bin/gpgv --quiet --keyring ${KEYRING} "${DIRECTORY}/key.asc.sig" "${DIRECTORY}/key.asc" > /dev/null 2>&1 && KEY_VALID="true" && break
+ /usr/bin/gpgv --quiet --keyring ${KEYRING} "${DIRECTORY}/key.asc.gpg" "${DIRECTORY}/key.asc" > /dev/null 2>&1 && KEY_VALID="true" && break
fi
done
@@ -386,7 +378,7 @@ EOF
Chroot "${DIRECTORY}" "apt-key add key.asc"
rm -f "${DIRECTORY}/key.asc"
- rm -f "${DIRECTORY}/key.asc.sig"
+ rm -f "${DIRECTORY}/key.asc.gpg"
done
Chroot "${DIRECTORY}" "apt-get update"