From 59498c5557092cf1935e4b9ac812d67f34ed0098 Mon Sep 17 00:00:00 2001 From: Chris Hofstaedtler Date: Sun, 20 Oct 2024 20:41:32 +0200 Subject: [PATCH] Switch default debootstrap tool to mmdebstrap mmdebstrap is the modern, fast tool. grml-small comes with mmdebstrap but not debootstrap, so it's really necessary there. Closes: #290 --- .github/workflows/test-build.yml | 2 +- config | 4 ++-- debian/control | 2 +- grml-debootstrap | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml index d9cadfa6..5f7a76a2 100644 --- a/.github/workflows/test-build.yml +++ b/.github/workflows/test-build.yml @@ -60,7 +60,7 @@ jobs: - stretch debootstrap: - - '' + - debootstrap - mmdebstrap exclude: diff --git a/config b/config index cd562e92..c825170b 100644 --- a/config +++ b/config @@ -101,8 +101,8 @@ # Name of debootstrap executable. # Supported values: 'debootstrap', 'cdebootstrap', 'mmdebstrap' -# Default: 'debootstrap' -# DEBOOTSTRAP='debootstrap' +# Default: 'mmdebstrap' +# DEBOOTSTRAP='mmdebstrap' # Pass extra options to debootstrap. # Default: no default. diff --git a/debian/control b/debian/control index 15e4ce02..d71e392d 100644 --- a/debian/control +++ b/debian/control @@ -25,7 +25,7 @@ Architecture: all Depends: bash (>= 4.3-11+deb8u2), debian-archive-keyring, - debootstrap (>= 1.0.65) | cdebootstrap (>= 0.3.16) | mmdebstrap, + mmdebstrap | debootstrap (>= 1.0.65) | cdebootstrap (>= 0.3.16), dosfstools, e2fsprogs, fdisk | util-linux (<< 2.29.2-3~), diff --git a/grml-debootstrap b/grml-debootstrap index 9d04e455..1849c364 100755 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -50,7 +50,7 @@ MNTPOINT="/mnt/debootstrap.$$" [ -n "$CONFFILES" ] || CONFFILES='/etc/debootstrap' [ -n "$DEBCONF" ] || DEBCONF='yes' [ -n "$DEBIAN_FRONTEND" ] || DEBIAN_FRONTEND='noninteractive' -[ -n "$DEBOOTSTRAP" ] || DEBOOTSTRAP='debootstrap' +[ -n "$DEBOOTSTRAP" ] || DEBOOTSTRAP='mmdebstrap' [ -n "$DEFAULT_LANGUAGE" ] || DEFAULT_LANGUAGE='en_US:en' [ -n "$DEFAULT_LOCALES" ] || DEFAULT_LOCALES='en_US.UTF-8' [ -n "$DISK_IDENTIFIER" ] || DISK_IDENTIFIER='26ada0c0-1165-4098-884d-aafd2220c2c6'