Merge main into bookworm-backports and release as 0.4.5~bpo12+1

2 files changed, 12 insertions, 2 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"
 				;;