From 9383ad916321c8804beb90d96329bf52ffd9cad6 Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Tue, 17 Jan 2023 07:16:35 +0100
Subject: debvm-create: use maybe-merged-usr hook

Requires mmdebstrap >= 1.3.0
Closes: #8
---
 bin/debvm-create | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'bin/debvm-create')

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" "$@"
-- 
cgit v1.2.3