48k.eu-mirror
/
ogclient
mirror of https://git.48k.eu/ogclient
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

live: get partition number using partno attribute 

Removes a workaround enumaration of the partitions of a given libfdisk
context. Use Partition class partno attribute.

This enables detecting non contiguous partitions, like:

	/dev/sda
		/dev/sda1
		/dev/sda2
		/dev/sda4
more_events
Jose M. Guisado 2022-04-27 10:03:02 +02:00
parent ad3d3b2d19
commit 3da8100a3b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/live/ogOperations.py
View File

@ -46,12 +46,13 @@ class OgLiveOperations:
part_setup['size'] = str(cxt.nsectors * cxt.sector_size // 1024) part_setup['size'] = str(cxt.nsectors * cxt.sector_size // 1024)
part_setup['used_size'] = '0' part_setup['used_size'] = '0'
def _refresh_payload_partition(self, cxt, pa, part_setup, num_part, disk): def _refresh_payload_partition(self, cxt, pa, part_setup, disk):
parttype = cxt.partition_to_string(pa, fdisk.FDISK_FIELD_TYPEID) parttype = cxt.partition_to_string(pa, fdisk.FDISK_FIELD_TYPEID)
fstype = cxt.partition_to_string(pa, fdisk.FDISK_FIELD_FSTYPE) fstype = cxt.partition_to_string(pa, fdisk.FDISK_FIELD_FSTYPE)
size = cxt.partition_to_string(pa, fdisk.FDISK_FIELD_SIZE) size = cxt.partition_to_string(pa, fdisk.FDISK_FIELD_SIZE)
source = f'/dev/{disk}{num_part}' partnum = pa.partno + 1
target = f'/mnt/{disk}{num_part}/' source = f'/dev/{disk}{partnum}'
target = f'/mnt/{disk}{partnum}/'
if cxt.label.name == 'gpt': if cxt.label.name == 'gpt':
code = GUID_MAP.get(parttype, 0x0) code = GUID_MAP.get(parttype, 0x0)
else: else:
@ -68,7 +69,7 @@ class OgLiveOperations:
part_setup['disk_type'] = '' part_setup['disk_type'] = ''
part_setup['partition'] = str(num_part) part_setup['partition'] = str(partnum)
part_setup['filesystem'] = fstype.upper() if fstype else 'EMPTY' part_setup['filesystem'] = fstype.upper() if fstype else 'EMPTY'
# part_setup['code'] = hex(code).removeprefix('0x') # part_setup['code'] = hex(code).removeprefix('0x')
part_setup['code'] = hex(code)[2:] part_setup['code'] = hex(code)[2:]
@ -330,9 +331,9 @@ class OgLiveOperations:
self._refresh_payload_disk(cxt, part_setup, num_disk) self._refresh_payload_disk(cxt, part_setup, num_disk)
parsed['disk_setup'].append(part_setup) parsed['disk_setup'].append(part_setup)
for num_part, pa in enumerate(cxt.parts, start=1): for pa in cxt.partitions:
part_setup = part_setup.copy() part_setup = part_setup.copy()
self._refresh_payload_partition(cxt, pa, part_setup, num_part, disk) self._refresh_payload_partition(cxt, pa, part_setup, disk)
parsed['partition_setup'].append(part_setup) parsed['partition_setup'].append(part_setup)
generate_menu(parsed['partition_setup']) generate_menu(parsed['partition_setup'])