From 57e06a5ef579236734a54376b001ea8e3614f183 Mon Sep 17 00:00:00 2001 From: MickLesk Date: Fri, 20 Feb 2026 21:12:41 +0100 Subject: [PATCH] docker-vm: add error handling for virt-customize finalize steps The hostname, machine-id and dbus cleanup calls were missing || true, so when virt-customize fails (e.g. on newer distros) the whole script aborts. The SSH config calls already had || true, these were just missed. Cloud-Init will set the hostname on first boot anyway. Ref #12073 --- vm/docker-vm.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vm/docker-vm.sh b/vm/docker-vm.sh index b4de65d94..1e745dd98 100644 --- a/vm/docker-vm.sh +++ b/vm/docker-vm.sh @@ -525,9 +525,9 @@ fi msg_info "Finalizing image (hostname, SSH config)" # Set hostname and prepare for unique machine-id -virt-customize -q -a "$WORK_FILE" --hostname "${HN}" >/dev/null 2>&1 -virt-customize -q -a "$WORK_FILE" --run-command "truncate -s 0 /etc/machine-id" >/dev/null 2>&1 -virt-customize -q -a "$WORK_FILE" --run-command "rm -f /var/lib/dbus/machine-id" >/dev/null 2>&1 +virt-customize -q -a "$WORK_FILE" --hostname "${HN}" >/dev/null 2>&1 || true +virt-customize -q -a "$WORK_FILE" --run-command "truncate -s 0 /etc/machine-id" >/dev/null 2>&1 || true +virt-customize -q -a "$WORK_FILE" --run-command "rm -f /var/lib/dbus/machine-id" >/dev/null 2>&1 || true # Configure SSH for Cloud-Init if [ "$USE_CLOUD_INIT" = "yes" ]; then