diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml index d9cadfa..5f7a76a 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/README.md b/README.md index 25bcde4..8e4c99f 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ grml-debootstrap [![test-build](https://github.com/grml/grml-debootstrap/actions/workflows/test-build.yml/badge.svg)](https://github.com/grml/grml-debootstrap/actions/workflows/test-build.yml) -This tool is a wrapper suite around debootstrap and cdebootstrap +This tool is a wrapper suite around mmdebstrap and debootstrap to ease installation of a pure [Debian](https://debian.org/) system. Configuration can be done on the command line, in a dialog frontend diff --git a/config b/config index cd562e9..c825170 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 15e4ce0..d71e392 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 0cf61f8..ed351f9 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' diff --git a/grml-debootstrap.8.txt b/grml-debootstrap.8.txt index 49c05cb..c9e43b1 100644 --- a/grml-debootstrap.8.txt +++ b/grml-debootstrap.8.txt @@ -3,7 +3,7 @@ grml-debootstrap(8) Name ---- -grml-debootstrap - wrapper around debootstrap for installing plain Debian +grml-debootstrap - wrapper around mmdebstrap for installing plain Debian Synopsis -------- @@ -14,8 +14,8 @@ image:images/screenshot.png[Screenshot] Introduction ------------ -grml-debootstrap is a wrapper suite around debootstrap (and cdebootstrap and mmdebstrap if you -want) for installing a plain Debian system very fast and easy. +grml-debootstrap is a wrapper suite around mmdebstrap (and debootstrap and +cdebootstrap) for installing a plain Debian system very fast and easy. All you have to do is adjust a few variables in the configuration file /etc/debootstrap/config or specify some command line options and invoke diff --git a/tests/build-vm-and-test.sh b/tests/build-vm-and-test.sh index c88c6c5..7d5f045 100755 --- a/tests/build-vm-and-test.sh +++ b/tests/build-vm-and-test.sh @@ -66,7 +66,7 @@ if [ "$1" == "run" ]; then -e DEBOOTSTRAP="$DEBOOTSTRAP" \ -w /code \ debian:"$HOST_RELEASE" \ - bash -c './tests/docker-install-deb.sh '"$DEB_NAME"' && ./tests/docker-build-vm.sh '"$(id -u)"' '"/code/$TARGET"' '"$RELEASE" + bash -c './tests/docker-install-deb.sh '"$DEB_NAME"' '"$DEBOOTSTRAP"' && ./tests/docker-build-vm.sh '"$(id -u)"' '"/code/$TARGET"' '"$RELEASE" elif [ "$1" == "test" ]; then # run tests from inside Debian system diff --git a/tests/docker-install-deb.sh b/tests/docker-install-deb.sh index b056952..36cf942 100755 --- a/tests/docker-install-deb.sh +++ b/tests/docker-install-deb.sh @@ -6,9 +6,9 @@ set -eu -o pipefail -if [ "$#" -ne 1 ]; then +if [ "$#" -ne 2 ]; then echo "$0: Invalid arguments" >&2 - echo "Expect: $0 DEB_NAME" >&2 + echo "Expect: $0 DEB_NAME DEBOOTSTRAP" >&2 exit 1 fi DEB_NAME="$1" @@ -16,4 +16,4 @@ DEB_NAME="$1" apt-get update # docker images can be relatively old, especially for unstable. apt-get upgrade -qq -y -apt-get install -qq -y "$DEB_NAME" +apt-get install -qq -y "$DEB_NAME" "$DEBOOTSTRAP"