summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbin/debvm-create5
-rw-r--r--debian/control1
2 files changed, 4 insertions, 2 deletions
diff --git a/bin/debvm-create b/bin/debvm-create
index c9837e8..9ab2472 100755
--- a/bin/debvm-create
+++ b/bin/debvm-create
@@ -356,7 +356,10 @@ set -- \
"$@"
# allow password-less root login
-set -- '--customize-hook=passwd --prefix "$1" --delete root' "$@"
+# In future, we should use passwd --prefix "$1" --delete root here, but the
+# --prefix option was added in trixie and the --root option uses chroot() and
+# attempts to load shared libraries from a potentially foreign chroot.
+set -- '--customize-hook=sed -i -e "s/^root:[*]:/root::/" "$1/etc/shadow"' "$@"
if test "$INITSYSTEM" = systemd && ! check_skip systemdnetwork; then
# dhcp on all network interfaces, and add a dns resolver
diff --git a/debian/control b/debian/control
index 341e8a7..87e8141 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,6 @@ Depends:
dpkg-dev,
e2fsprogs,
mmdebstrap (>= 1.3.0),
- passwd,
qemu-kvm (>> 1:8.0) | qemu-system-any,
# Required for -device virtio-net-pci,netdev=net0
ipxe-qemu,