Skip to content

Commit

Permalink
d/control: record (actual) minimum debootstrap version
Browse files Browse the repository at this point in the history
  • Loading branch information
zeha committed Nov 17, 2023
1 parent 3bcafe4 commit 0a759e7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 22 deletions.
2 changes: 1 addition & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -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~),
Expand Down
21 changes: 0 additions & 21 deletions packer/debian64_provision.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down

0 comments on commit 0a759e7

Please sign in to comment.