mirror of
https://git.proxmox.com/git/mirror_lxc
synced 2025-08-15 21:26:57 +00:00
Merge pull request #693 from hsoft/debian-keyring
Fetch Debian archive GPG keyrings when they're not available
This commit is contained in:
commit
2c3576e721
@ -248,6 +248,24 @@ openssh-server
|
|||||||
release=$3
|
release=$3
|
||||||
|
|
||||||
trap cleanup EXIT SIGHUP SIGINT SIGTERM
|
trap cleanup EXIT SIGHUP SIGINT SIGTERM
|
||||||
|
# If debian-archive-keyring isn't installed, fetch GPG keys directly
|
||||||
|
releasekeyring=/usr/share/keyrings/debian-archive-keyring.gpg
|
||||||
|
if [ ! -f $releasekeyring ]; then
|
||||||
|
releasekeyring="$cache/archive-key.gpg"
|
||||||
|
case $release in
|
||||||
|
"squeeze")
|
||||||
|
gpgkeyname="archive-key-6.0"
|
||||||
|
;;
|
||||||
|
"wheezy")
|
||||||
|
gpgkeyname="archive-key-7.0"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
gpgkeyname="archive-key-8"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
wget https://ftp-master.debian.org/keys/${gpgkeyname}.asc -O - --quiet \
|
||||||
|
| gpg --import --no-default-keyring --keyring=${releasekeyring}
|
||||||
|
fi
|
||||||
# check the mini debian was not already downloaded
|
# check the mini debian was not already downloaded
|
||||||
mkdir -p "$cache/partial-$release-$arch"
|
mkdir -p "$cache/partial-$release-$arch"
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
@ -258,7 +276,7 @@ openssh-server
|
|||||||
# download a mini debian into a cache
|
# download a mini debian into a cache
|
||||||
echo "Downloading debian minimal ..."
|
echo "Downloading debian minimal ..."
|
||||||
debootstrap --verbose --variant=minbase --arch=$arch \
|
debootstrap --verbose --variant=minbase --arch=$arch \
|
||||||
--include=$packages \
|
--include=$packages --keyring=${releasekeyring} \
|
||||||
"$release" "$cache/partial-$release-$arch" $MIRROR
|
"$release" "$cache/partial-$release-$arch" $MIRROR
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
echo "Failed to download the rootfs, aborting."
|
echo "Failed to download the rootfs, aborting."
|
||||||
|
Loading…
Reference in New Issue
Block a user