From 67e84f15f8bb30860b176b709f5b0d9c730912d7 Mon Sep 17 00:00:00 2001 From: Markus Hilger Date: Tue, 28 Jul 2026 01:49:38 +0200 Subject: [PATCH] Keep the root filesystem guard reachable when extraction fails source_remote imageboot.sh is the last thing the diskless cmdline hook runs, so returning early on a failed extraction ended the hook and left dracut to time out. Falling through instead reaches the existing /sysroot/sbin/init guard, which reports the failure and holds the node so it stays reachable over ssh, as it did before extraction was checked. --- .../el10-diskless/profiles/default/scripts/imageboot.sh | 2 +- .../el9-diskless/profiles/default/scripts/imageboot.sh | 2 +- .../ubuntu20.04-diskless/profiles/default/scripts/imageboot.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/confluent_osdeploy/el10-diskless/profiles/default/scripts/imageboot.sh b/confluent_osdeploy/el10-diskless/profiles/default/scripts/imageboot.sh index 3e3c3c13..ca07be2a 100644 --- a/confluent_osdeploy/el10-diskless/profiles/default/scripts/imageboot.sh +++ b/confluent_osdeploy/el10-diskless/profiles/default/scripts/imageboot.sh @@ -55,7 +55,7 @@ if [ "untethered" = "$(getarg confluent_imagemethod)" -o "uncompressed" = "$(get else mount -t tmpfs disklessroot /sysroot fi - extract_untethered_rootimg || return 1 + extract_untethered_rootimg else TETHERED=1 mount -o discard /dev/zram0 /mnt/overlay diff --git a/confluent_osdeploy/el9-diskless/profiles/default/scripts/imageboot.sh b/confluent_osdeploy/el9-diskless/profiles/default/scripts/imageboot.sh index 1df5f015..1cac0588 100644 --- a/confluent_osdeploy/el9-diskless/profiles/default/scripts/imageboot.sh +++ b/confluent_osdeploy/el9-diskless/profiles/default/scripts/imageboot.sh @@ -55,7 +55,7 @@ if [ "untethered" = "$(getarg confluent_imagemethod)" -o "uncompressed" = "$(get else mount -t tmpfs disklessroot /sysroot fi - extract_untethered_rootimg || return 1 + extract_untethered_rootimg else TETHERED=1 mount -o discard /dev/zram0 /mnt/overlay diff --git a/confluent_osdeploy/ubuntu20.04-diskless/profiles/default/scripts/imageboot.sh b/confluent_osdeploy/ubuntu20.04-diskless/profiles/default/scripts/imageboot.sh index 64ca8c78..df23007f 100644 --- a/confluent_osdeploy/ubuntu20.04-diskless/profiles/default/scripts/imageboot.sh +++ b/confluent_osdeploy/ubuntu20.04-diskless/profiles/default/scripts/imageboot.sh @@ -65,7 +65,7 @@ elif grep -q confluent_imagemethod=uncompressed /proc/cmdline; then mount -t tmpfs disklessroot /sysroot fi if [ "$TETHERED" = 0 ]; then - extract_untethered_rootimg || return 1 + extract_untethered_rootimg elif [ ! -f /tmp/mountparts.sh ]; then mkdir -p /mnt/overlay/upper /mnt/overlay/work mount -t overlay -o upperdir=/mnt/overlay/upper,workdir=/mnt/overlay/work,lowerdir=/mnt/remote disklessroot /sysroot