From 54b1507d60db718dc2a6dc3e987e34cfa99e74ac Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Thu, 10 Apr 2025 08:10:26 +0200
Subject: debvm-create: --skip=autologin also covers deletion of the root
 password

Suggested-by: Gioele Barabucci <gioele@debian.org>
---
 bin/debvm-create | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'bin')

diff --git a/bin/debvm-create b/bin/debvm-create
index f6cd90a..a4871fb 100755
--- a/bin/debvm-create
+++ b/bin/debvm-create
@@ -68,10 +68,11 @@ The following tasks may be skipped.
 
 =item B<autologin>
 
-Skips adding a the customize-autologin.sh to B<mmdebstrap> that configures
-automatic root login on a serial console and also parses the C<TERM> kernel
-cmdline and passes it as C<TERM> to B<agetty>.
-This is specific to using B<finit>, B<runit>, B<systemd> or B<sysv> as init system.
+Do not setup the machine for automatic password-less root login on the console.
+The F<customize-autologin.sh> hook for B<mmdebstrap> normally configures  automatic login for the init systems B<finit>, B<runit>, B<systemd> and B<sysv>.
+Automatic discovery of the C<TERM> kernel command line variable and its passing to B<agetty> is skipped as well.
+Last but not least, to actually arrive at a shell prompt, the root password is normally being deleted.
+All of these steps are skipped at once.
 
 =item B<ext4>
 
@@ -356,9 +357,6 @@ set -- \
 	"--customize-hook=printf '$ETC_HOSTS_TEMPLATE' '$VMNAME' >"'"$1/etc/hosts"' \
 	"$@"
 
-# allow password-less root login
-set -- "--customize-hook=$SHARE_DIR/customize-delete-rootpw.sh" "$@"
-
 if test "$INITSYSTEM" = systemd && ! check_skip systemdnetwork; then
 	# dhcp on all network interfaces, and add a dns resolver
 	set -- \
@@ -403,7 +401,8 @@ fi
 if ! check_skip autologin; then
 	set -- \
 		--include=login \
-		"--customize-hook=$SHARE_DIR/customize-autologin.sh" "$@"
+		"--customize-hook=$SHARE_DIR/customize-autologin.sh" \
+		"--customize-hook=$SHARE_DIR/customize-delete-rootpw.sh" "$@"
 fi
 
 if test "$(id -u)" = 0; then
-- 
cgit v1.2.3


From 6d2623d23f8ef22b0bdf77174b164636f887914e Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Thu, 10 Apr 2025 11:26:08 +0200
Subject: debvm-create: reword --skip=autologin documentation again

This gets rid of unidiomatic "at once". It drops implementation details
such as which hook performs the action and focuses on the user visible
effects.

Reported-by: Gioele Barabucci <gioele@debian.org>
---
 bin/debvm-create | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'bin')

diff --git a/bin/debvm-create b/bin/debvm-create
index a4871fb..78e86bf 100755
--- a/bin/debvm-create
+++ b/bin/debvm-create
@@ -69,10 +69,10 @@ The following tasks may be skipped.
 =item B<autologin>
 
 Do not setup the machine for automatic password-less root login on the console.
-The F<customize-autologin.sh> hook for B<mmdebstrap> normally configures  automatic login for the init systems B<finit>, B<runit>, B<systemd> and B<sysv>.
-Automatic discovery of the C<TERM> kernel command line variable and its passing to B<agetty> is skipped as well.
-Last but not least, to actually arrive at a shell prompt, the root password is normally being deleted.
-All of these steps are skipped at once.
+This comprises the following changes that would normally be performed.
+Automatic root login is configured for the init systems B<finit>, B<runit>, B<systemd> and B<sysv>.
+Forwarding of the C<TERM> kernel command line to B<agetty> is configured.
+The root password is deleted such that a login does not ask for it and the system directly boots to a shell prompt.
 
 =item B<ext4>
 
-- 
cgit v1.2.3