StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

storage/v2: report grub_device on disk 

If a partition has grub_device, that is shown at the disk level as well.
This commit is contained in:
Dan Bungert 2021-10-07 13:36:35 -06:00
parent 491842f15f
commit f17139c4a0
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
subiquity/common/filesystem/labels.py
View File

@ -260,6 +260,12 @@ def for_client(device, *, min_size=0):
def _for_client_disk(disk, *, min_size=0): def _for_client_disk(disk, *, min_size=0):
path = getattr(disk, 'path', None) path = getattr(disk, 'path', None)
grub_device = getattr(disk, 'grub_device', False) grub_device = getattr(disk, 'grub_device', False)
if not grub_device:
for part in disk._partitions:
if part.flag in ['bios_grub', 'prep'] or part.grub_device:
grub_device = True
break
return types.Disk( return types.Disk(
id=disk.id, id=disk.id,
label=label(disk), label=label(disk),

2
subiquity/tests/api/test_api.py
View File

@ -277,7 +277,7 @@ class TestAdd(TestAPI):
} }
single_add = await inst.post('/storage/v2/add_partition', data) single_add = await inst.post('/storage/v2/add_partition', data)
self.assertEqual(2, len(single_add['disks'][0]['partitions'])) self.assertEqual(2, len(single_add['disks'][0]['partitions']))
# self.assertTrue(single_add['disks'][0]['grub_device']) self.assertTrue(single_add['disks'][0]['grub_device'])
await inst.post('/storage/v2/reset') await inst.post('/storage/v2/reset')