From 0a759e73024f24becfae9148ed614e01c537938d Mon Sep 17 00:00:00 2001
From: Chris Hofstaedtler <chris@hofstaedtler.name>
Date: Mon, 13 Nov 2023 23:46:11 +0100
Subject: [PATCH] d/control: record (actual) minimum debootstrap version

---
 debian/control               |  2 +-
 packer/debian64_provision.sh | 21 ---------------------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/debian/control b/debian/control
index 645c84c..9910589 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Package: grml-debootstrap
 Architecture: all
 Depends:
  debian-archive-keyring,
- debootstrap (>= 0.3.3.3) | cdebootstrap (>= 0.3.16) | mmdebstrap,
+ debootstrap (>= 1.0.65) | cdebootstrap (>= 0.3.16) | mmdebstrap,
  dosfstools,
  e2fsprogs,
  fdisk | util-linux (<< 2.29.2-3~),
diff --git a/packer/debian64_provision.sh b/packer/debian64_provision.sh
index d170554..64086b8 100644
--- a/packer/debian64_provision.sh
+++ b/packer/debian64_provision.sh
@@ -203,30 +203,9 @@ EOF
   fi
 }
 
-verify_debootstrap_version() {
-  local required_version=1.0.65
-  local present_version=$(dpkg-query --show --showformat='${Version}' debootstrap)
-
-  if dpkg --compare-versions $present_version lt $required_version ; then
-    echo "** debootstrap version $present_version is older than minimum required version $required_version - upgrading."
-    apt-get update
-    apt-get -y install debootstrap
-  fi
-}
-
 grml_debootstrap_execution() {
   echo "* Installing Debian"
 
-  # release specific stuff
-  case "$DEBIAN_VERSION" in
-    lenny)
-      GRML_DEB_OPTIONS="--mirror http://archive.debian.org/debian/ --filesystem ext3"
-      ;;
-    stretch)
-      verify_debootstrap_version
-      ;;
-  esac
-
   echo "** Executing: $GRML_DEBOOTSTRAP --hostname $DEBIAN_VERSION --release $DEBIAN_VERSION --target ${INSTALL_TARGET} --grub ${GRUB_TARGET} --password grml --force $GRML_DEB_OPTIONS" | tee -a /tmp/grml-debootstrap.log
   $GRML_DEBOOTSTRAP --hostname "${DEBIAN_VERSION}" --release "${DEBIAN_VERSION}" --target "${INSTALL_TARGET}" --grub "${GRUB_TARGET}" --password grml --force $GRML_DEB_OPTIONS 2>&1 | tee -a /tmp/grml-debootstrap.log
 }
-- 
2.1.4