Revert "TT#60950 Remove stretch labels from deployment.sh (trunk is buster now)"

We still need "stretch" for disaster recovery tests.

This reverts commit fd5d8c1dd8.

Change-Id: Ib1bf52a393bc429ff2a065bef873abea089e4916
changes/96/31096/1
Alexander Lutay 7 years ago
parent fd5d8c1dd8
commit 5f5a55ccc9

@ -1391,7 +1391,7 @@ deb ${DBG_MIRROR} ${DEBIAN_RELEASE}-debug main contrib non-free
EOF
case "$DEBIAN_RELEASE" in
buster)
stretch|buster)
if ! [ -r "/usr/share/debootstrap/scripts/${DEBIAN_RELEASE}" ] ; then
echo "Enabling ${DEBIAN_RELEASE} support for debootstrap via symlink to sid"
ln -s /usr/share/debootstrap/scripts/sid "/usr/share/debootstrap/scripts/${DEBIAN_RELEASE}"
@ -1801,7 +1801,7 @@ EOT
fi
case "$DEBIAN_RELEASE" in
buster)
stretch|buster)
set_custom_grub_boot_options
;;
esac
@ -2109,7 +2109,7 @@ puppet_install_from_puppet () {
chroot $TARGET apt-get -y install resolvconf libnss-myhostname
case "$DEBIAN_RELEASE" in
buster)
stretch|buster)
if [ ! -x "${TARGET}/usr/bin/dirmngr" ] ; then
echo "Installing dirmngr on Debian ${DEBIAN_RELEASE}, otherwise 'apt-key adv --recv-keys' is failing to fetch GPG key"
chroot $TARGET apt-get -y install dirmngr
@ -2140,7 +2140,7 @@ EOF
# Fix Facter error while running in chroot, facter fails if /etc/mtab is absent:
case "$DEBIAN_RELEASE" in
buster)
stretch|buster)
chroot ${TARGET} ln -s /proc/self/mounts /etc/mtab || true
;;
esac

Loading…
Cancel
Save