diff options
| -rwxr-xr-x | bin/debefivm-create | 2 | ||||
| -rwxr-xr-x | bin/debefivm-run | 12 | ||||
| -rw-r--r-- | debian/changelog | 13 | ||||
| -rwxr-xr-x | share/customize-kernel.sh | 2 |
4 files changed, 21 insertions, 8 deletions
diff --git a/bin/debefivm-create b/bin/debefivm-create index 1c03be5..f6368df 100755 --- a/bin/debefivm-create +++ b/bin/debefivm-create @@ -415,6 +415,8 @@ set -- "$@" \ "--customize-hook=download vmlinuz '$WORKDIR/kernel'" \ "--customize-hook=download initrd.img '$WORKDIR/initrd'" \ "--customize-hook=download '/usr/lib/systemd/boot/efi/linux$EFIARCH.efi.stub' '$WORKDIR/stub'" \ + '--customize-hook=rm -f "$1/etc/apt/apt.conf.d/00mmdebstrap" "$1/etc/apt/apt.conf.d/99debconf" "$1/var/cache/ldconfig/aux-cache" "$1/var/lib/dbus/machine-id" "$1/var/log/alternatives.log" "$1/var/log/apt/eipp.log.xz" "$1/var/log/apt/history.log" "$1/var/log/apt/term.log" "$1/var/log/dpkg.log"' \ + '--customize-hook=truncate -s 0 "$1/etc/machine-id"' \ '--customize-hook=mount --bind "$1" "$1/mnt"' \ '--customize-hook=mount -t tmpfs tmpfs "$1/mnt/dev" -o mode=0755' \ '--customize-hook=rm -f "$1/usr/sbin/policy-rc.d"' \ diff --git a/bin/debefivm-run b/bin/debefivm-run index c93d7d2..50e87de 100755 --- a/bin/debefivm-run +++ b/bin/debefivm-run @@ -165,14 +165,22 @@ while getopts :a:gi:s:-: OPTCHAR; do graphical|help) "opt_$OPTARG" ;; - architecture|efi-vars|image|netopt|skip|sshport|transport) + architecture|image|netopt|skip|sshport|transport) test "$OPTIND" -gt "$#" && usage_error "missing argument for --$OPTARG" "opt_$OPTARG" "$(nth_arg "$OPTIND" "$@")" OPTIND=$((OPTIND+1)) ;; - architecture=*|efi-vars=*|image=*|netopt=*|skip=*|sshport=*|transport=*) + efi-vars) + test "$OPTIND" -gt "$#" && usage_error "missing argument for --$OPTARG" + opt_efi_vars "$(nth_arg "$OPTIND" "$@")" + OPTIND=$((OPTIND+1)) + ;; + architecture=*|image=*|netopt=*|skip=*|sshport=*|transport=*) "opt_${OPTARG%%=*}" "${OPTARG#*=}" ;; + efi-vars=*) + opt_efi_vars "${OPTARG#*=}" + ;; *) usage_error "unrecognized option --$OPTARG" ;; diff --git a/debian/changelog b/debian/changelog index 30c7c94..992a38d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,17 @@ -debvm (0.4.4~bpo12+2) bookworm-backports; urgency=medium +debvm (0.4.5~bpo12+1) bookworm-backports; urgency=medium + * Rebuild for bookworm-backports. * Relax qemu dependency - -- Helmut Grohne <helmut@subdivi.de> Thu, 19 Jun 2025 22:34:59 +0200 + -- Helmut Grohne <helmut@subdivi.de> Thu, 26 Jun 2025 07:39:09 +0200 -debvm (0.4.4~bpo12+1) bookworm-backports; urgency=medium +debvm (0.4.5) unstable; urgency=medium - * Rebuild for bookworm-backports. + * debefivm-create: clean up unreproducible files (Closes: #1107719) + * debefivm-run: fix parsing of --efi-vars option + * debvm-create: fix corner case in #1079443 workaround - -- Helmut Grohne <helmut@subdivi.de> Wed, 18 Jun 2025 11:12:28 +0200 + -- Helmut Grohne <helmut@subdivi.de> Wed, 18 Jun 2025 11:18:37 +0200 debvm (0.4.4) unstable; urgency=medium diff --git a/share/customize-kernel.sh b/share/customize-kernel.sh index 0a252a4..d792f49 100755 --- a/share/customize-kernel.sh +++ b/share/customize-kernel.sh @@ -43,7 +43,7 @@ manual_add_modules virtio_blk EOF chmod +x "$TARGET/etc/initramfs-tools/hooks/work_around_1079443" if test "${1:-}" = --update && test -x "$TARGET/usr/bin/update-initramfs"; then - chroot "$TARGET/update-initramfs -u" + chroot "$TARGET" update-initramfs -u fi } |