tests/pivot_root: use the mmdebstrap binary we copied into the chroot

.mailmap

@@ -1,2 +1,4 @@
 Johannes Schauer Marin Rodrigues <josch@mister-muffin.de>
 Johannes Schauer Marin Rodrigues <josch@mister-muffin.de> <j.schauer@email.de>
+Helmut Grohne <helmut@subdivi.de> <helmut.grohne@intenta.de>
+Benjamin Drung <benjamin.drung@ionos.com> <benjamin.drung@cloud.ionos.com>

README.md

@@ -152,11 +152,16 @@ Contributors
 ============
 
  - Johannes Schauer Marin Rodrigues (main author)
+ - Gioele Barabucci
  - Helmut Grohne
  - Benjamin Drung
- - Steve Dodd
  - Josh Triplett
  - Konstantin Demin
+ - David Kalnischkies
+ - Jochen Sprickerhof
+ - Joe Groocock
+ - Nicolas Vigier
+ - Raul Tambre
+ - Steve Dodd
  - Trent W. Buck
  - Vagrant Cascadian
- - Gioele Barabucci

coverage.py

@@ -207,6 +207,14 @@ def main():
     # parse coverage.txt
     config_order, config_dict = parse_config("coverage.txt")
 
+    if set(os.listdir("tests")) - set(config_order):
+        print(
+            "test(s) missing from coverage.txt: %s"
+            % (", ".join(sorted(set(os.listdir("tests")) - set(config_order)))),
+            file=sys.stderr,
+        )
+        exit(1)
+
     # produce the list of tests using the cartesian product of all allowed
     # dists, modes, variants and formats of a given test
     tests = []

run_qemu.sh

@@ -39,7 +39,7 @@ case $ARCH in
 		;;
 	arm64)
 		MACHINE="type=virt,gic-version=host,accel=kvm"
-		CODE="/usr/share/AAVMF/AAVMF_CODE.fd,readonly"
+		CODE="/usr/share/AAVMF/AAVMF_CODE.fd"
 		QEMUARCH="aarch64"
 		;;
 	*) echo "qemu kvm not supported on $ARCH" >&2;;
@@ -63,7 +63,7 @@ timeout --foreground 40m qemu-system-"$QEMUARCH" \
 	-serial unix:/tmp/ttyS0,server,nowait \
 	-serial unix:/tmp/ttyS1,server,nowait \
 	-net nic,model=virtio -net user \
-	-drive if=pflash,format=raw,unit=0,read-only,file="$CODE" \
+	-drive if=pflash,format=raw,unit=0,read-only=on,file="$CODE" \
 	-virtfs local,id=mmdebstrap,path="$(pwd)/shared",security_model=none,mount_tag=mmdebstrap \
 	-drive file="$tmpdir/debian-$DEFAULT_DIST-overlay.qcow",cache=unsafe,index=0,if=virtio \
 	>"$tmpdir/log" 2>&1 || ret=$?

tests/pivot_root

@@ -32,7 +32,7 @@ if [ {{ MODE }} = "unshare" ]; then
 		--customize-hook='chmod +x "$1"/'"$MMDEBSTRAP" \
 		--customize-hook='mount -o rbind "$1" /mnt && cd /mnt && /sbin/pivot_root . mnt' \
 		--customize-hook='unshare -U echo nested unprivileged unshare' \
-		--customize-hook='{{ CMD }} --mode=unshare --variant=apt --include=mount {{ DIST }} /tmp/chroot3.tar {{ MIRROR }}' \
+		--customize-hook="/$MMDEBSTRAP"' --mode=unshare --variant=apt --include=mount {{ DIST }} /tmp/chroot3.tar {{ MIRROR }}' \
 		--customize-hook='copy-out /tmp/chroot3.tar /tmp' \
 		--customize-hook='rm "$1/'"$MMDEBSTRAP"'"' \
 		--customize-hook='umount -l mnt sys' \
@@ -46,7 +46,7 @@ fi
 $prefix {{ CMD }} --mode={{ MODE }} --variant=apt --include=mount \
 	--customize-hook="upload $MMDEBSTRAP /$MMDEBSTRAP" \
 	--customize-hook='chmod +x "$1"/'"$MMDEBSTRAP" \
-	--chrooted-customize-hook='{{ CMD }} --mode=unshare --variant=apt --include=mount {{ DIST }} /tmp/chroot3.tar {{ MIRROR }}' \
+	--chrooted-customize-hook="/$MMDEBSTRAP"' --mode=unshare --variant=apt --include=mount {{ DIST }} /tmp/chroot3.tar {{ MIRROR }}' \
 	--customize-hook='copy-out /tmp/chroot3.tar /tmp' \
 	--customize-hook='rm "$1/'"$MMDEBSTRAP"'"' \
 	{{ DIST }} /tmp/chroot2.tar {{ MIRROR }}