RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added a PARTUUID -> parted index, this in order to properly set the boot flag on the correct partition. Perhaps there's a smarter way. I suspect parted can operate on a given partition ID, but haven't found the docs for it yet.

This commit is contained in:
Anton Hvornum 2021-09-04 19:09:16 +02:00
parent 429006fe4b
commit 278ded8e74
No known key found for this signature in database
GPG Key ID: F1234C5BA67C59DF
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
archinstall/lib/disk.py
View File

@ -799,6 +799,14 @@ class Filesystem:
SysCommand('sync') SysCommand('sync')
return True return True
def partuuid_to_index(self, uuid):
output = json.loads(SysCommand(f"lsblk --json -o+PARTUUID {self.blockdevice.device}").decode('UTF-8'))
for device in output['blockdevices']:
for index, partition in enumerate(device['children']):
if partition['partuuid'].lower() == uuid:
return index
def load_layout(self, layout :dict): def load_layout(self, layout :dict):
from .luks import luks2 from .luks import luks2
@ -820,6 +828,8 @@ class Filesystem:
start=partition.get('start', '1MiB'), # TODO: Revisit sane block starts (4MB for memorycards for instance) start=partition.get('start', '1MiB'), # TODO: Revisit sane block starts (4MB for memorycards for instance)
end=partition.get('size', '100%'), end=partition.get('size', '100%'),
partition_format=partition.get('filesystem', {}).get('format', 'btrfs')) partition_format=partition.get('filesystem', {}).get('format', 'btrfs'))
# TODO: device_instance some times become None
# print('Device instance:', partition['device_instance'])
elif (partition_uuid := partition.get('PARTUUID')) and (partition_instance := self.blockdevice.get_partition(uuid=partition_uuid)): elif (partition_uuid := partition.get('PARTUUID')) and (partition_instance := self.blockdevice.get_partition(uuid=partition_uuid)):
print("Re-using partition_instance:", partition_instance) print("Re-using partition_instance:", partition_instance)
@ -855,9 +865,11 @@ class Filesystem:
unlocked_device.format(partition['filesystem']['format']) unlocked_device.format(partition['filesystem']['format'])
elif partition.get('format', False): elif partition.get('format', False):
print(partition)
partition['device_instance'].format(partition['filesystem']['format']) partition['device_instance'].format(partition['filesystem']['format'])
if partition.get('boot', False):
self.set(self.partuuid_to_index(partition['device_instance'].uuid), 'boot on')
def find_partition(self, mountpoint): def find_partition(self, mountpoint):
for partition in self.blockdevice: for partition in self.blockdevice:
if partition.target_mountpoint == mountpoint or partition.mountpoint == mountpoint: if partition.target_mountpoint == mountpoint or partition.mountpoint == mountpoint:
@ -865,7 +877,7 @@ class Filesystem:
def raw_parted(self, string: str): def raw_parted(self, string: str):
if (cmd_handle := SysCommand(f'/usr/bin/parted -s {string}')).exit_code != 0: if (cmd_handle := SysCommand(f'/usr/bin/parted -s {string}')).exit_code != 0:
log(f"Could not generate partition: {cmd_handle}", level=logging.ERROR, fg="red") log(f"Parted ended with a bad exit code: {cmd_handle}", level=logging.ERROR, fg="red")
return cmd_handle return cmd_handle
def parted(self, string: str): def parted(self, string: str):
@ -911,6 +923,7 @@ class Filesystem:
return self.parted(f'{self.blockdevice.device} name {partition + 1} "{name}"') == 0 return self.parted(f'{self.blockdevice.device} name {partition + 1} "{name}"') == 0
def set(self, partition: int, string: str): def set(self, partition: int, string: str):
log(f"Setting {string} on (parted) partition index {partition+1}", level=logging.INFO)
return self.parted(f'{self.blockdevice.device} set {partition + 1} {string}') == 0 return self.parted(f'{self.blockdevice.device} set {partition + 1} {string}') == 0
def parted_mklabel(self, device: str, disk_label: str): def parted_mklabel(self, device: str, disk_label: str):