Skip to content

Commit

Permalink
Switch default debootstrap tool to mmdebstrap
Browse files Browse the repository at this point in the history
mmdebstrap is the modern, fast tool. grml-small comes with mmdebstrap
but not debootstrap, so it's really necessary there.

Closes: #290
  • Loading branch information
zeha committed Oct 20, 2024
1 parent 022ccff commit 6292d77
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
- stretch

debootstrap:
- ''
- debootstrap
- mmdebstrap

This comment has been minimized.

Copy link
@zeha

zeha Oct 24, 2024

Author Member

we could debate changing mmdebstrap to '', as it is the default now. but this makes the exclusion list below harder to read

This comment has been minimized.

Copy link
@mika

mika Oct 25, 2024

Member

leaving this at mmdebstrap feels fine for me.

I'm actually wondering whether we should drop cdebootstrap support, I never ever use that, I think it's worth dropping this?


exclude:
Expand Down
4 changes: 2 additions & 2 deletions config
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -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~),
Expand Down
2 changes: 1 addition & 1 deletion grml-debootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion tests/build-vm-and-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions tests/docker-install-deb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@

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"

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"

0 comments on commit 6292d77

Please sign in to comment.