run apt with -oDebug:: options for all calls and not only in run_download()

mmdebstrap

@@ -963,6 +963,16 @@ sub run_dpkg_progress {
 sub run_apt_progress {
     my $options  = shift;
     my @debs     = @{ $options->{PKGS} // [] };
+
+    if ($verbosity_level >= 3) {
+        my @apt_debug_opts = qw(
+          -oDebug::pkgProblemResolver=true
+          -oDebug::pkgDepCache::Marker=1
+          -oDebug::pkgDepCache::AutoInstall=1
+        );
+        push @{ $options->{ARGV} }, @apt_debug_opts;
+    }
+
     my $get_exec = sub {
         my @prefix = ();
         my @opts   = ();
@@ -1031,15 +1041,6 @@ sub run_apt_download_progress {
         info "downloading packages with apt...";
     }
 
-    if ($verbosity_level >= 3) {
-        my @apt_debug_opts = qw(
-          -oDebug::pkgProblemResolver=true
-          -oDebug::pkgDepCache::Marker=1
-          -oDebug::pkgDepCache::AutoInstall=1
-        );
-        push @{ $options->{APT_ARGV} }, @apt_debug_opts;
-    }
-
     pipe my $rfh, my $wfh;
     my $pid = open my $fh, '-|' // error "fork() failed: $!";
     if ($pid == 0) {

tests/as-debootstrap-unshare-wrapper

@@ -7,7 +7,7 @@ if [ ! -e /mmdebstrap-testenv ]; then
 	exit 1
 fi
 sysctl -w kernel.unprivileged_userns_clone=1
-adduser --gecos user --disabled-password user
+useradd --home-dir /home/user --create-home user
 runuser -u user -- {{ CMD }} --variant=custom --mode=unshare --setup-hook='env container=lxc debootstrap unstable "$1" {{ MIRROR }}' - /tmp/debian-mm.tar {{ MIRROR }}
 
 mkdir /tmp/debian-mm

tests/auto-mode-without-unshare-capabilities

@@ -5,7 +5,7 @@ if [ ! -e /mmdebstrap-testenv ]; then
 	echo "this test modifies the system and should only be run inside a container" >&2
 	exit 1
 fi
-adduser --gecos user --disabled-password user
+useradd --home-dir /home/user --create-home user
 sysctl -w kernel.unprivileged_userns_clone=0
 runuser -u user -- {{ CMD }} --mode=auto --variant=apt {{ DIST }} /tmp/debian-chroot.tar.gz {{ MIRROR }}
 tar -tf /tmp/debian-chroot.tar.gz | sort | diff -u tar1.txt -

tests/check-for-bit-by-bit-identical-format-output

@@ -5,7 +5,7 @@ if [ ! -e /mmdebstrap-testenv ]; then
 	echo "this test modifies the system and should only be run inside a container" >&2
 	exit 1
 fi
-adduser --gecos user --disabled-password user
+useradd --home-dir /home/user --create-home user
 sysctl -w kernel.unprivileged_userns_clone=1
 export SOURCE_DATE_EPOCH={{ SOURCE_DATE_EPOCH }}
 {{ CMD }} --mode=root --variant={{ VARIANT }} {{ DIST }} /tmp/debian-chroot-root.{{ FORMAT }} {{ MIRROR }}

tests/chrootless-fakeroot

@@ -8,7 +8,7 @@ if [ "$(id -u)" -eq 0 ] && ! id -u user > /dev/null 2>&1; then
 		echo "this test modifies the system and should only be run inside a container" >&2
 		exit 1
 	fi
-	adduser --gecos user --disabled-password user
+	useradd --home-dir /home/user --create-home user
 fi
 prefix=
 [ "$(id -u)" -eq 0 ] && prefix="runuser -u user --"

tests/create-arm64-tarball

@@ -6,7 +6,7 @@ if [ "$(id -u)" -eq 0 ] && ! id -u user > /dev/null 2>&1; then
 		echo "this test modifies the system and should only be run inside a container" >&2
 		exit 1
 	fi
-	adduser --gecos user --disabled-password user
+	useradd --home-dir /home/user --create-home user
 fi
 if [ "{{ MODE }}" = unshare ]; then
 	if [ ! -e /mmdebstrap-testenv ]; then

tests/create-gzip-compressed-tarball

@@ -5,7 +5,7 @@ if [ ! -e /mmdebstrap-testenv ]; then
 	echo "this test modifies the system and should only be run inside a container" >&2
 	exit 1
 fi
-adduser --gecos user --disabled-password user
+useradd --home-dir /home/user --create-home user
 sysctl -w kernel.unprivileged_userns_clone=1
 runuser -u user -- {{ CMD }} --mode=unshare --variant=apt {{ DIST }} /tmp/debian-chroot.tar.gz {{ MIRROR }}
 printf '\037\213\010' | cmp --bytes=3 /tmp/debian-chroot.tar.gz -

tests/create-tarball-dry-run

@@ -14,7 +14,7 @@ if [ "$(id -u)" -eq 0 ] && [ "{{ MODE }}" != root ] && [ "{{ MODE }}" != auto ];
 			echo "this test modifies the system and should only be run inside a container" >&2
 			exit 1
 		fi
-		adduser --gecos user --disabled-password user
+		useradd --home-dir /home/user --create-home user
 	fi
 	if [ "{{ MODE }}" = unshare ]; then
 		if [ ! -e /mmdebstrap-testenv ]; then

tests/custom-tmpdir

@@ -7,7 +7,7 @@ if [ ! -e /mmdebstrap-testenv ]; then
 fi
 # https://www.etalabs.net/sh_tricks.html
 quote () { printf %s\\n "$1" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/'/" ; }
-adduser --gecos user --disabled-password user
+useradd --home-dir /home/user --create-home user
 sysctl -w kernel.unprivileged_userns_clone=1
 homedir=$(runuser -u user -- sh -c 'cd && pwd')
 # apt:test/integration/test-apt-key

tests/cwd-directory-not-accessible-by-unshared-user

@@ -5,7 +5,7 @@ if [ ! -e /mmdebstrap-testenv ]; then
 	echo "this test modifies the system and should only be run inside a container" >&2
 	exit 1
 fi
-adduser --gecos user --disabled-password user
+useradd --home-dir /home/user --create-home user
 sysctl -w kernel.unprivileged_userns_clone=1
 mkdir /tmp/debian-chroot
 chmod 700 /tmp/debian-chroot

tests/dev-ptmx

@@ -12,7 +12,7 @@ if [ ! -e /mmdebstrap-testenv ]; then
 	exit 1
 fi
 if [ "$(id -u)" -eq 0 ] && ! id -u user > /dev/null 2>&1; then
-	adduser --gecos user --disabled-password user
+	useradd --home-dir /home/user --create-home user
 fi
 prefix=
 [ "$(id -u)" -eq 0 ] && [ "{{ MODE }}" != "root" ] && prefix="runuser -u user --"
@@ -117,8 +117,8 @@ END
 # use script to create a fake tty
 # run all tests as root and as a normal user (the latter requires ptmxmode=666)
 script -qfec "$prefix {{ CMD }} --mode={{ MODE }} --variant=apt \
-	--include=gcc,libc6-dev,python3,adduser \
+	--include=gcc,libc6-dev,python3,passwd \
-	--customize-hook='chroot \"\$1\" adduser --gecos user --disabled-password user' \
+	--customize-hook='chroot \"\$1\" useradd --home-dir /home/user --create-home user' \
 	--customize-hook='chroot \"\$1\" python3 -c \"import pty; print(pty.openpty())\"' \
 	--customize-hook='chroot \"\$1\" runuser -u user -- python3 -c \"import pty; print(pty.openpty())\"' \
 	--customize-hook='chroot \"\$1\" script -c \"echo foobar\"' \

tests/fail-without-etc-subuid

@@ -5,7 +5,7 @@ if [ ! -e /mmdebstrap-testenv ]; then
 	echo "this test modifies the system and should only be run inside a container" >&2
 	exit 1
 fi
-adduser --gecos user --disabled-password user
+useradd --home-dir /home/user --create-home user
 sysctl -w kernel.unprivileged_userns_clone=1
 rm /etc/subuid
 ret=0

tests/fail-without-username-in-etc-subuid

@@ -5,7 +5,7 @@ if [ ! -e /mmdebstrap-testenv ]; then
 	echo "this test modifies the system and should only be run inside a container" >&2
 	exit 1
 fi
-adduser --gecos user --disabled-password user
+useradd --home-dir /home/user --create-home user
 sysctl -w kernel.unprivileged_userns_clone=1
 awk -F: '$1!="user"' /etc/subuid > /etc/subuid.tmp
 mv /etc/subuid.tmp /etc/subuid

tests/file-mirror-automount-hook

@@ -6,7 +6,7 @@ if [ ! -e /mmdebstrap-testenv ]; then
 	exit 1
 fi
 if [ "$(id -u)" -eq 0 ] && ! id -u user > /dev/null 2>&1; then
-	adduser --gecos user --disabled-password user
+	useradd --home-dir /home/user --create-home user
 fi
 prefix=
 [ "$(id -u)" -eq 0 ] && [ "{{ MODE }}" != "root" ] && prefix="runuser -u user --"

tests/install-doc-debian

@@ -6,7 +6,7 @@ if [ "$(id -u)" -eq 0 ] && ! id -u user > /dev/null 2>&1; then
 		echo "this test modifies the system and should only be run inside a container" >&2
 		exit 1
 	fi
-	adduser --gecos user --disabled-password user
+	useradd --home-dir /home/user --create-home user
 fi
 prefix=
 [ "$(id -u)" -eq 0 ] && prefix="runuser -u user --"

tests/install-doc-debian-and-output-tarball

@@ -7,7 +7,7 @@ if [ "$(id -u)" -eq 0 ] && ! id -u user > /dev/null 2>&1; then
 		echo "this test modifies the system and should only be run inside a container" >&2
 		exit 1
 	fi
-	adduser --gecos user --disabled-password user
+	useradd --home-dir /home/user --create-home user
 fi
 prefix=
 [ "$(id -u)" -eq 0 ] && prefix="runuser -u user --"

tests/install-doc-debian-and-test-hooks

@@ -7,7 +7,7 @@ if [ "$(id -u)" -eq 0 ] && ! id -u user > /dev/null 2>&1; then
 		echo "this test modifies the system and should only be run inside a container" >&2
 		exit 1
 	fi
-	adduser --gecos user --disabled-password user
+	useradd --home-dir /home/user --create-home user
 fi
 prefix=
 [ "$(id -u)" -eq 0 ] && prefix="runuser -u user --"

tests/install-libmagic-mgc-on-arm64

@@ -6,7 +6,7 @@ if [ "$(id -u)" -eq 0 ] && ! id -u user > /dev/null 2>&1; then
 		echo "this test modifies the system and should only be run inside a container" >&2
 		exit 1
 	fi
-	adduser --gecos user --disabled-password user
+	useradd --home-dir /home/user --create-home user
 fi
 prefix=
 [ "$(id -u)" -eq 0 ] && prefix="runuser -u user --"

tests/jessie-or-older

@@ -5,7 +5,7 @@ if [ ! -e /mmdebstrap-testenv ]; then
 	echo "this test modifies the system and should only be run inside a container" >&2
 	exit 1
 fi
-adduser --gecos user --disabled-password user
+useradd --home-dir /home/user --create-home user
 sysctl -w kernel.unprivileged_userns_clone=1
 export SOURCE_DATE_EPOCH={{ SOURCE_DATE_EPOCH }}
 

tests/merged-fakechroot-inside-unmerged-chroot

@@ -38,9 +38,9 @@ chroot "$rootfs" env --chdir=/mnt \
 	{{ DIST }} /tmp/chroot-fakechroot.tar {{ MIRROR }}
 SCRIPT
 chmod +x script.sh
-{{ CMD }} --mode=root --variant=apt --include=perl,python3,adduser,fakeroot,fakechroot \
+{{ CMD }} --mode=root --variant=apt --include=perl,python3,passwd,fakeroot,fakechroot \
 	--hook-dir=./hooks/no-merged-usr \
-	--customize-hook='chroot "$1" adduser --gecos user --disabled-password user' \
+	--customize-hook='chroot "$1" useradd --home-dir /home/user --create-home user' \
 	--customize-hook='chroot "$1" sh -c "exec test \"\$(realpath -e /usr/bin/ldd)\" = /usr/bin/ldd"' \
 	--customize-hook='chroot "$1" sh -c "exec test ! -e /usr/sbin/ldconfig"' \
 	--customize-hook=./script.sh \

tests/missing-dev-sys-proc-inside-the-chroot

@@ -5,6 +5,6 @@ if [ ! -e /mmdebstrap-testenv ]; then
 	echo "this test modifies the system and should only be run inside a container" >&2
 	exit 1
 fi
-adduser --gecos user --disabled-password user
+useradd --home-dir /home/user --create-home user
 sysctl -w kernel.unprivileged_userns_clone=1
 runuser -u user -- {{ CMD }} --mode=unshare --variant=custom --include=dpkg,dash,diffutils,coreutils,libc-bin,sed {{ DIST }} /dev/null {{ MIRROR }}

tests/missing-device-nodes-outside-the-chroot

@@ -6,7 +6,7 @@ if [ ! -e /mmdebstrap-testenv ]; then
 	exit 1
 fi
 rm /dev/console
-adduser --gecos user --disabled-password user
+useradd --home-dir /home/user --create-home user
 sysctl -w kernel.unprivileged_userns_clone=1
 runuser -u user -- {{ CMD }} --mode=unshare --variant=apt {{ DIST }} /tmp/debian-chroot.tar {{ MIRROR }}
 tar -tf /tmp/debian-chroot.tar | sort | diff -u tar1.txt -

tests/no-sbin-in-path

@@ -14,7 +14,7 @@ if [ "$(id -u)" -eq 0 ] && ! id -u user > /dev/null 2>&1; then
 		echo "this test modifies the system and should only be run inside a container" >&2
 		exit 1
 	fi
-	adduser --gecos user --disabled-password user
+	useradd --home-dir /home/user --create-home user
 fi
 prefix=
 [ "$(id -u)" -eq 0 ] && prefix="runuser -u user --"

tests/pivot_root

@@ -10,7 +10,7 @@ if [ ! -e /mmdebstrap-testenv ]; then
 fi
 
 if [ "$(id -u)" -eq 0 ] && ! id -u user > /dev/null 2>&1; then
-	adduser --gecos user --disabled-password user
+	useradd --home-dir /home/user --create-home user
 fi
 
 prefix=

tests/root-mode-inside-unshare-chroot

@@ -10,7 +10,7 @@ if [ ! -e /mmdebstrap-testenv ]; then
 	exit 1
 fi
 [ "$(whoami)" = "root" ]
-adduser --gecos user --disabled-password user
+useradd --home-dir /home/user --create-home user
 sysctl -w kernel.unprivileged_userns_clone=1
 cat << 'SCRIPT' > script.sh
 #!/bin/sh

tests/special-hooks-with-mode-mode

@@ -6,7 +6,7 @@ if [ "$(id -u)" -eq 0 ] && ! id -u user > /dev/null 2>&1; then
 		echo "this test modifies the system and should only be run inside a container" >&2
 		exit 1
 	fi
-	adduser --gecos user --disabled-password user
+	useradd --home-dir /home/user --create-home user
 fi
 if [ "{{ MODE }}" = unshare ]; then
 	if [ ! -e /mmdebstrap-testenv ]; then

tests/tarfilter-idshift

@@ -6,7 +6,7 @@ if [ ! -e /mmdebstrap-testenv ]; then
 	exit 1
 fi
 trap "rm -f /tmp/debian-chroot.tar /tmp/debian-chroot-shifted.tar /tmp/debian-chroot.txt /tmp/debian-chroot-shiftedback.tar /tmp/expected; rm -rf /tmp/debian-chroot" EXIT INT TERM
-adduser --gecos user --disabled-password user
+useradd --home-dir /home/user --create-home user
 echo user:100000:65536 | cmp /etc/subuid -
 echo user:100000:65536 | cmp /etc/subgid -
 sysctl -w kernel.unprivileged_userns_clone=1

tests/unpack-doc-debian

@@ -6,7 +6,7 @@ if [ "$(id -u)" -eq 0 ] && ! id -u user > /dev/null 2>&1; then
 		echo "this test modifies the system and should only be run inside a container" >&2
 		exit 1
 	fi
-	adduser --gecos user --disabled-password user
+	useradd --home-dir /home/user --create-home user
 fi
 if [ "{{ MODE }}" = unshare ]; then
 	if [ ! -e /mmdebstrap-testenv ]; then

tests/unshare-include-deb

@@ -10,7 +10,7 @@ if [ "$(id -u)" -eq 0 ] && ! id -u user > /dev/null 2>&1; then
 		echo "this test modifies the system and should only be run inside a container" >&2
 		exit 1
 	fi
-	adduser --gecos user --disabled-password user
+	useradd --home-dir /home/user --create-home user
 fi
 [ "$(id -u)" -eq 0 ] && prefix="runuser -u user --"