2
0
mirror of https://github.com/xcat2/confluent.git synced 2026-11-19 08:52:20 +00:00

Merge pull request #384 from Obihoernchen/fix/image2disk-no-boot-partition

Use the root filesystem for grub when an image has no /boot
This commit is contained in:
Jarrod Johnson
2026-11-12 09:41:42 -05:00
committed by GitHub
3 changed files with 3 additions and 3 deletions
@@ -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')
@@ -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')
@@ -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')