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 59498c5
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 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

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

0 comments on commit 59498c5

Please sign in to comment.