summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHelmut Grohne <helmut@subdivi.de>2023-01-17 07:16:35 +0100
committerHelmut Grohne <helmut@subdivi.de>2023-01-17 07:16:35 +0100
commit9383ad916321c8804beb90d96329bf52ffd9cad6 (patch)
treede377cb5a16050f8c52f3e140557d7d9f9733fab
parent359fe82c202a4925f383a53242c78ac025292cd4 (diff)
downloaddebvm-9383ad916321c8804beb90d96329bf52ffd9cad6.tar.gz
debvm-create: use maybe-merged-usr hook
Requires mmdebstrap >= 1.3.0 Closes: #8
-rwxr-xr-xbin/debvm-create4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/debvm-create b/bin/debvm-create
index ca4de73..be9ce08 100755
--- a/bin/debvm-create
+++ b/bin/debvm-create
@@ -320,9 +320,9 @@ if test "$DEBVER" -le 8; then
set -- --hook-dir=/usr/share/mmdebstrap/hooks/jessie-or-older "$@"
fi
-if test "$DEBVER" -ge 12 && ! check_skip usrmerge; then
+if ! check_skip usrmerge; then
# Avoid the usrmerge package
- set -- --hook-dir=/usr/share/mmdebstrap/hooks/merged-usr "$@"
+ set -- --hook-dir=/usr/share/mmdebstrap/hooks/maybe-merged-usr "$@"
fi
set -- "--customize-hook=$SHARE_DIR/customize-autologin.sh" "$@"