CHANGELOG.md

@@ -1,8 +1,3 @@
-0.8.5 (2022-03-07)
-------------------
-
- - improve documentation
-
 0.8.4 (2022-02-11)
 ------------------
 

coverage.sh

@@ -304,15 +304,6 @@ for f in "/tmp/debian-$dist-debootstrap/etc/shells" "/tmp/debian-$dist-mm/etc/sh
 	sort -o "\$f" "\$f"
 done
 
-# Because of unreproducible uids (#969631) we created the _apt user ourselves
-# and because passwd is not Essential:yes we didn't use useradd. But newer
-# versions of adduser and shadow will create a different /etc/shadow
-for f in shadow shadow-; do
-	if grep -q '^_apt:!:' /tmp/debian-$dist-debootstrap/etc/\$f; then
-		sed -i 's/^_apt:\*:\([^:]\+\):0:99999:7:::$/_apt:!:\1::::::/' /tmp/debian-$dist-mm/etc/\$f
-	fi
-done
-
 # workaround for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=917773
 if ! cmp /tmp/debian-$dist-debootstrap/etc/shadow /tmp/debian-$dist-mm/etc/shadow; then
 	echo patching /etc/shadow on $dist $variant >&2
@@ -344,7 +335,7 @@ if [ $variant = - ]; then
 fi
 
 # check if the file content differs
-diff --unified --no-dereference --recursive /tmp/debian-$dist-debootstrap /tmp/debian-$dist-mm >&2
+diff --unified --no-dereference --recursive /tmp/debian-$dist-debootstrap /tmp/debian-$dist-mm
 
 # check permissions, ownership, symlink targets, modification times using tar
 # directory mtimes will differ, thus we equalize them first

make_mirror.sh

@@ -638,7 +638,7 @@ END
 		copy-in "$tmpdir/mini-httpd" /etc/default : \
 		copy-in "$tmpdir/hosts" /etc/ : \
 		touch /mmdebstrap-testenv : \
-		upload /usr/lib/EXTLINUX/mbr.bin /mbr.bin : \
+		upload /usr/lib/SYSLINUX/mbr.bin /mbr.bin : \
 		copy-file-to-device /mbr.bin /dev/sda size:440 : \
 		rm /mbr.bin : \
 		extlinux / : \

mmdebstrap

@@ -23,7 +23,7 @@
 use strict;
 use warnings;
 
-our $VERSION = '0.8.5';
+our $VERSION = '0.8.4';
 
 use English;
 use Getopt::Long;
@@ -6162,7 +6162,7 @@ information.
 
 Example: Install busybox symlinks
 
-    --extract-hook='chroot "$1" /bin/busybox --install -s'
+    --extract-hook='chroot "$1" busybox --install -s'
 
 =item B<--essential-hook>=I<command>
 
@@ -6592,8 +6592,7 @@ chroot as I<fileoutside>. In contrast to B<copy-out>, this command only
 handles files and not directories. To copy a directory recursively out of the
 chroot, use B<copy-out> or B<tar-out>. Its advantage is, that by being able to
 specify the full path on the outside, including the filename, the file on the
-outside can have a different name from the file on the inside. In contrast to
+outside can have a different name from the file on the inside.
-B<copy-out> and B<tar-out>, this command follows symlinks.
 
 =item B<upload> I<fileoutside> I<fileinside>
 
@@ -6833,20 +6832,6 @@ Create a bootable USB Stick that boots into a full Debian desktop:
     $ qemu-system-x86_64 -m 1G -enable-kvm debian-unstable.img
     $ sudo dd if=debian-unstable.img of=/dev/sdXXX status=progress
 
-On architectures without extlinux you can also boot using grub2:
-
-    $ mmdebstrap --include=linux-image-amd64,grub2,systemd-sysv unstable fs.tar
-    $ guestfish -N debian-unstable.img=disk:2G -- \
-        part-disk /dev/sda mbr : \
-        part-set-bootable /dev/sda 1 true : \
-        set-label /dev/sda1 rootfs : \
-        mkfs ext4 /dev/sda1 : mount /dev/sda1 / : \
-        tar-in fs.tar / xattrs:true : \
-        command "grub-install /dev/sda" : \
-        command update-grub : \
-        sync : umount / : shutdown
-    $ qemu-system-x86_64 -m 1G -enable-kvm debian-unstable.img
-
 Build libdvdcss2.deb without installing installing anything or changing apt
 sources on the current system:
 
@@ -6872,7 +6857,7 @@ Use as replacement for autopkgtest-build-qemu and vmdb2:
     >
     > label linux
     > kernel /vmlinuz
-    > append initrd=/initrd.img root=/dev/vda1 rw console=ttyS0
+    > append initrd=/initrd.img root=/dev/vda1 console=ttyS0
     END
     $ guestfish -N debian-unstable.img=disk:8G -- \
         part-disk /dev/sda mbr : \