From 610e161d449918b1ed5cb64ee17ab378d323b9c9 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Thu, 11 Nov 2021 10:10:12 +0000 Subject: Removed legacy code related to disk wiping. Also added in partprobe in strategic places (not sure this is enough, will have to test) --- archinstall/lib/disk/filesystem.py | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) (limited to 'archinstall/lib/disk/filesystem.py') diff --git a/archinstall/lib/disk/filesystem.py b/archinstall/lib/disk/filesystem.py index 84b11c05..61a789a1 100644 --- a/archinstall/lib/disk/filesystem.py +++ b/archinstall/lib/disk/filesystem.py @@ -20,22 +20,6 @@ class Filesystem: self.mode = mode def __enter__(self, *args, **kwargs): - if self.blockdevice.keep_partitions is False: - log(f'Wiping {self.blockdevice} by using partition format {self.mode}', level=logging.DEBUG) - if self.mode == GPT: - if self.parted_mklabel(self.blockdevice.device, "gpt"): - self.blockdevice.flush_cache() - return self - else: - raise DiskError('Problem setting the disk label type to GPT:', f'/usr/bin/parted -s {self.blockdevice.device} mklabel gpt') - elif self.mode == MBR: - if self.parted_mklabel(self.blockdevice.device, "msdos"): - return self - else: - raise DiskError('Problem setting the disk label type to msdos:', f'/usr/bin/parted -s {self.blockdevice.device} mklabel msdos') - else: - raise DiskError(f'Unknown mode selected to format in: {self.mode}') - # TODO: partition_table_type is hardcoded to GPT at the moment. This has to be changed. elif self.mode == self.blockdevice.partition_table_type: log(f'Kept partition format {self.mode} for {self.blockdevice}', level=logging.DEBUG) @@ -74,6 +58,8 @@ class Filesystem: if not self.parted_mklabel(self.blockdevice.device, "msdos"): raise KeyError(f"Could not create a MSDOS label on {self}") + self.blockdevice.flush_cache() + # We then iterate the partitions in order for partition in layout.get('partitions', []): # We don't want to re-add an existing partition (those containing a UUID already) @@ -132,6 +118,9 @@ class Filesystem: if partition.target_mountpoint == mountpoint or partition.mountpoint == mountpoint: return partition + def partprobe(self): + SysCommand(f'bash -c "partprobe"') + def raw_parted(self, string: str): if (cmd_handle := SysCommand(f'/usr/bin/parted -s {string}')).exit_code != 0: log(f"Parted ended with a bad exit code: {cmd_handle}", level=logging.ERROR, fg="red") @@ -146,6 +135,7 @@ class Filesystem: :type string: str """ if (parted_handle := self.raw_parted(string)).exit_code == 0: + self.partprobe() return True else: raise DiskError(f"Parted failed to add a partition: {parted_handle}") @@ -199,4 +189,5 @@ class Filesystem: SysCommand(f'bash -c "umount {device}?"') except: pass + self.partprobe() return self.raw_parted(f'{device} mklabel {disk_label}').exit_code == 0 -- cgit v1.2.3-70-g09d2 From 58099534404ca9c9ee68b9cbc06c3a8e739cbbcc Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Thu, 11 Nov 2021 11:37:23 +0000 Subject: elif -> if --- archinstall/lib/disk/filesystem.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'archinstall/lib/disk/filesystem.py') diff --git a/archinstall/lib/disk/filesystem.py b/archinstall/lib/disk/filesystem.py index 61a789a1..0c535c7d 100644 --- a/archinstall/lib/disk/filesystem.py +++ b/archinstall/lib/disk/filesystem.py @@ -21,7 +21,7 @@ class Filesystem: def __enter__(self, *args, **kwargs): # TODO: partition_table_type is hardcoded to GPT at the moment. This has to be changed. - elif self.mode == self.blockdevice.partition_table_type: + if self.mode == self.blockdevice.partition_table_type: log(f'Kept partition format {self.mode} for {self.blockdevice}', level=logging.DEBUG) else: raise DiskError(f'The selected partition table format {self.mode} does not match that of {self.blockdevice}.') -- cgit v1.2.3-70-g09d2 From 15e569d0bd0c910bd65573007135ab10267d82bc Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Thu, 11 Nov 2021 14:07:08 +0000 Subject: Adding in debugging --- archinstall/lib/disk/filesystem.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'archinstall/lib/disk/filesystem.py') diff --git a/archinstall/lib/disk/filesystem.py b/archinstall/lib/disk/filesystem.py index 0c535c7d..28df097e 100644 --- a/archinstall/lib/disk/filesystem.py +++ b/archinstall/lib/disk/filesystem.py @@ -165,6 +165,11 @@ class Filesystem: new_uuid_set = (previous_partition_uuids ^ {partition.uuid for partition in self.blockdevice.partitions.values()}) if len(new_uuid_set) > 0: new_uuid = new_uuid_set.pop() + print('Blockdevice:', self.blockdevice) + print('Partitions:', self.blockdevice.partitions) + print('Partition set:', new_uuid_set) + print('New UUID:', [new_uuid]) + print('get_partition():', self.blockdevice.get_partition) if new_uuid: return self.blockdevice.get_partition(new_uuid) else: -- cgit v1.2.3-70-g09d2 From 4ea7feb04e2a742435b45db242c91c0f2b88000c Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Thu, 11 Nov 2021 14:16:14 +0000 Subject: Added more debugging (some duplicate, but that's fine) --- archinstall/lib/disk/blockdevice.py | 5 ++++- archinstall/lib/disk/filesystem.py | 15 +++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) (limited to 'archinstall/lib/disk/filesystem.py') diff --git a/archinstall/lib/disk/blockdevice.py b/archinstall/lib/disk/blockdevice.py index 5204f09b..8ee5e74a 100644 --- a/archinstall/lib/disk/blockdevice.py +++ b/archinstall/lib/disk/blockdevice.py @@ -217,7 +217,7 @@ class BlockDevice: def get_partition(self, uuid): count = 0 while count < 5: - for partition in self: + for partition in self.partitions: if partition.uuid == uuid: return partition else: @@ -226,4 +226,7 @@ class BlockDevice: count += 1 else: log(f"Could not find {uuid} in disk after 5 retries",level=logging.INFO) + print(f"Partitions: {self.partitions}") + print(f"UUID parts: {partition.uuid for partition in self.partitions}") + print(f"UUID: {[uuid]}") raise DiskError(f"New partition {uuid} never showed up after adding new partition on {self}") diff --git a/archinstall/lib/disk/filesystem.py b/archinstall/lib/disk/filesystem.py index 28df097e..cf2a286e 100644 --- a/archinstall/lib/disk/filesystem.py +++ b/archinstall/lib/disk/filesystem.py @@ -165,13 +165,16 @@ class Filesystem: new_uuid_set = (previous_partition_uuids ^ {partition.uuid for partition in self.blockdevice.partitions.values()}) if len(new_uuid_set) > 0: new_uuid = new_uuid_set.pop() - print('Blockdevice:', self.blockdevice) - print('Partitions:', self.blockdevice.partitions) - print('Partition set:', new_uuid_set) - print('New UUID:', [new_uuid]) - print('get_partition():', self.blockdevice.get_partition) if new_uuid: - return self.blockdevice.get_partition(new_uuid) + try: + return self.blockdevice.get_partition(new_uuid) + except Exception as err: + print('Blockdevice:', self.blockdevice) + print('Partitions:', self.blockdevice.partitions) + print('Partition set:', new_uuid_set) + print('New UUID:', [new_uuid]) + print('get_partition():', self.blockdevice.get_partition) + raise err else: count += 1 log(f"Could not get uuid for partition. Waiting for the {count} time",level=logging.DEBUG) -- cgit v1.2.3-70-g09d2