From 973a340ed7c0988386abd68bf776d265bb55ab7c Mon Sep 17 00:00:00 2001 From: Markus Hilger Date: Thu, 12 Nov 2026 15:17:36 +0100 Subject: [PATCH] Use the root filesystem for grub when an image has no /boot image2disk only took the boot UUID from a /boot volume. Images captured from a system without a separate /boot left it unset, and rewriting the EFI stub grub.cfg failed with "TypeError: sequence item 5: expected str instance, NoneType found". Fall back to the UUID of the / filesystem, which holds /boot in that case. --- .../el8-diskless/profiles/default/scripts/image2disk.py | 2 +- .../el9-diskless/profiles/default/scripts/image2disk.py | 2 +- .../ubuntu20.04-diskless/profiles/default/scripts/image2disk.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/confluent_osdeploy/el8-diskless/profiles/default/scripts/image2disk.py b/confluent_osdeploy/el8-diskless/profiles/default/scripts/image2disk.py index 195d46ea..09d13eeb 100644 --- a/confluent_osdeploy/el8-diskless/profiles/default/scripts/image2disk.py +++ b/confluent_osdeploy/el8-diskless/profiles/default/scripts/image2disk.py @@ -512,7 +512,7 @@ def install_to_disk(imgpath): sys.stdout.write('\x1b[1K\rDone writing {0}'.format(vol['mount'])) sys.stdout.write('\n') sys.stdout.flush() - if vol['mount'] == '/boot': + if vol['mount'] == '/boot' or (vol['mount'] == '/' and not bootuuid): # /boot may live on / tbootuuid = subprocess.check_output(['blkid', vol['targetdisk']]) if b'UUID="' in tbootuuid: bootuuid = tbootuuid.split(b'UUID="', 1)[1].split(b'"')[0].decode('utf8') diff --git a/confluent_osdeploy/el9-diskless/profiles/default/scripts/image2disk.py b/confluent_osdeploy/el9-diskless/profiles/default/scripts/image2disk.py index a35252e0..3698c5ba 100644 --- a/confluent_osdeploy/el9-diskless/profiles/default/scripts/image2disk.py +++ b/confluent_osdeploy/el9-diskless/profiles/default/scripts/image2disk.py @@ -664,7 +664,7 @@ def install_to_disk(imgpath): sys.stdout.write('\x1b[1K\rDone writing {0}'.format(vol['mount'])) sys.stdout.write('\n') sys.stdout.flush() - if vol['mount'] == '/boot': + if vol['mount'] == '/boot' or (vol['mount'] == '/' and not bootuuid): # /boot may live on / tbootuuid = subprocess.check_output(['blkid', vol['targetdisk']]) if b'UUID="' in tbootuuid: bootuuid = tbootuuid.split(b'UUID="', 1)[1].split(b'"')[0].decode('utf8') diff --git a/confluent_osdeploy/ubuntu20.04-diskless/profiles/default/scripts/image2disk.py b/confluent_osdeploy/ubuntu20.04-diskless/profiles/default/scripts/image2disk.py index 151e60db..ad76b34e 100644 --- a/confluent_osdeploy/ubuntu20.04-diskless/profiles/default/scripts/image2disk.py +++ b/confluent_osdeploy/ubuntu20.04-diskless/profiles/default/scripts/image2disk.py @@ -454,7 +454,7 @@ def install_to_disk(imgpath): sys.stdout.write('\x1b[1K\rDone writing {0}'.format(vol['mount'])) sys.stdout.write('\n') sys.stdout.flush() - if vol['mount'] == '/boot': + if vol['mount'] == '/boot' or (vol['mount'] == '/' and not bootuuid): # /boot may live on / tbootuuid = subprocess.check_output(['blkid', vol['targetdisk']]) if b'UUID="' in tbootuuid: bootuuid = tbootuuid.split(b'UUID="', 1)[1].split(b'"')[0].decode('utf8')