From 76aef703ff22c80108c8bd27b317387818c46442 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 7 Aug 2026 15:42:10 -0400 Subject: [PATCH] avoid moving firmware directories if they don't exist --- .../el10-diskless/profiles/default/scripts/imageboot.sh | 4 +++- .../el7-diskless/profiles/default/scripts/imageboot.sh | 4 +++- .../el8-diskless/profiles/default/scripts/imageboot.sh | 4 +++- .../el9-diskless/profiles/default/scripts/imageboot.sh | 4 +++- .../suse15-diskless/profiles/default/scripts/imageboot.sh | 4 +++- .../profiles/default/scripts/imageboot.sh | 4 +++- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/confluent_osdeploy/el10-diskless/profiles/default/scripts/imageboot.sh b/confluent_osdeploy/el10-diskless/profiles/default/scripts/imageboot.sh index 0bc7300b..aeb6f601 100644 --- a/confluent_osdeploy/el10-diskless/profiles/default/scripts/imageboot.sh +++ b/confluent_osdeploy/el10-diskless/profiles/default/scripts/imageboot.sh @@ -144,7 +144,9 @@ if grep installtodisk /proc/cmdline > /dev/null; then fi mv /lib/modules/$(uname -r) /lib/modules/$(uname -r)-ramfs ln -s /sysroot/lib/modules/$(uname -r) /lib/modules/ -mv /lib/firmware /lib/firmware-ramfs +if [ -d /lib/firmware ]; then + mv /lib/firmware /lib/firmware-ramfs +fi ln -s /sysroot/lib/firmware /lib/firmware kill $(grep -l ^/usr/lib/systemd/systemd-udevd /proc/*/cmdline|cut -d/ -f 3) if [ $TETHERED -eq 1 ]; then diff --git a/confluent_osdeploy/el7-diskless/profiles/default/scripts/imageboot.sh b/confluent_osdeploy/el7-diskless/profiles/default/scripts/imageboot.sh index 0e960776..406dc01b 100644 --- a/confluent_osdeploy/el7-diskless/profiles/default/scripts/imageboot.sh +++ b/confluent_osdeploy/el7-diskless/profiles/default/scripts/imageboot.sh @@ -128,6 +128,8 @@ if grep installtodisk /proc/cmdline > /dev/null; then fi mv /lib/modules/$(uname -r) /lib/modules/$(uname -r)-ramfs ln -s /sysroot/lib/modules/$(uname -r) /lib/modules/ -mv /lib/firmware /lib/firmware-ramfs +if [ -d /lib/firmware ]; then + mv /lib/firmware /lib/firmware-ramfs +fi ln -s /sysroot/lib/firmware /lib/firmware exec /opt/confluent/bin/start_root diff --git a/confluent_osdeploy/el8-diskless/profiles/default/scripts/imageboot.sh b/confluent_osdeploy/el8-diskless/profiles/default/scripts/imageboot.sh index 6ca880fb..ac9dd67d 100644 --- a/confluent_osdeploy/el8-diskless/profiles/default/scripts/imageboot.sh +++ b/confluent_osdeploy/el8-diskless/profiles/default/scripts/imageboot.sh @@ -132,7 +132,9 @@ if grep installtodisk /proc/cmdline > /dev/null; then fi mv /lib/modules/$(uname -r) /lib/modules/$(uname -r)-ramfs ln -s /sysroot/lib/modules/$(uname -r) /lib/modules/ -mv /lib/firmware /lib/firmware-ramfs +if [ -d /lib/firmware ]; then + mv /lib/firmware /lib/firmware-ramfs +fi ln -s /sysroot/lib/firmware /lib/firmware kill $(grep -l ^/usr/lib/systemd/systemd-udevd /proc/*/cmdline|cut -d/ -f 3) if [ $TETHERED -eq 1 ]; then diff --git a/confluent_osdeploy/el9-diskless/profiles/default/scripts/imageboot.sh b/confluent_osdeploy/el9-diskless/profiles/default/scripts/imageboot.sh index 7dd29141..cac45184 100644 --- a/confluent_osdeploy/el9-diskless/profiles/default/scripts/imageboot.sh +++ b/confluent_osdeploy/el9-diskless/profiles/default/scripts/imageboot.sh @@ -146,7 +146,9 @@ if grep installtodisk /proc/cmdline > /dev/null; then fi mv /lib/modules/$(uname -r) /lib/modules/$(uname -r)-ramfs ln -s /sysroot/lib/modules/$(uname -r) /lib/modules/ -mv /lib/firmware /lib/firmware-ramfs +if [ -d /lib/firmware ]; then + mv /lib/firmware /lib/firmware-ramfs +fi ln -s /sysroot/lib/firmware /lib/firmware rm -f /sysroot/etc/dracut.conf.d/diskless.conf # remove diskless dracut from runtime, to make kdump happier kill $(grep -l ^/usr/lib/systemd/systemd-udevd /proc/*/cmdline|cut -d/ -f 3) diff --git a/confluent_osdeploy/suse15-diskless/profiles/default/scripts/imageboot.sh b/confluent_osdeploy/suse15-diskless/profiles/default/scripts/imageboot.sh index 1fb4e6a2..558510e3 100644 --- a/confluent_osdeploy/suse15-diskless/profiles/default/scripts/imageboot.sh +++ b/confluent_osdeploy/suse15-diskless/profiles/default/scripts/imageboot.sh @@ -138,7 +138,9 @@ if grep installtodisk /proc/cmdline > /dev/null; then fi mv /lib/modules/$(uname -r) /lib/modules/$(uname -r)-ramfs ln -s /sysroot/lib/modules/$(uname -r) /lib/modules/ -mv /lib/firmware /lib/firmware-ramfs +if [ -d /lib/firmware ]; then + mv /lib/firmware /lib/firmware-ramfs +fi ln -s /sysroot/lib/firmware /lib/firmware chroot /sysroot chkstat --system --set --noheader > /dev/null exec /opt/confluent/bin/start_root 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 df23007f..897c46e4 100644 --- a/confluent_osdeploy/ubuntu20.04-diskless/profiles/default/scripts/imageboot.sh +++ b/confluent_osdeploy/ubuntu20.04-diskless/profiles/default/scripts/imageboot.sh @@ -144,7 +144,9 @@ ln -s /etc/systemd/system/onboot.service /sysroot/etc/systemd/system/multi-user. cp /etc/confluent/functions /sysroot/etc/confluent/functions mv /lib/modules/$(uname -r) /lib/modules/$(uname -r)-ramfs ln -s /sysroot/lib/modules/$(uname -r) /lib/modules/ -mv /lib/firmware /lib/firmware-ramfs +if [ -d /lib/firmware ]; then + mv /lib/firmware /lib/firmware-ramfs +fi ln -s /sysroot/lib/firmware /lib/firmware rm /sysroot/etc/machine-id if [ -e /sys/devices/virtual/dmi/id/product_uuid ]; then