disk: change from_partition() parameters (#3039)

archlinux · Dec 22, 2024 · 5f8cdcb · 5f8cdcb
1 parent a8c2a5a
commit 5f8cdcb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/archinstall/lib/disk/device_handler.py b/archinstall/lib/disk/device_handler.py
@@ -109,11 +109,8 @@ def load_devices(self) -> None:
 				partition_infos.append(
 					_PartitionInfo.from_partition(
 						partition,
+						lsblk_info,
 						fs_type,
-						lsblk_info.partn,
-						lsblk_info.partuuid,
-						lsblk_info.uuid,
-						lsblk_info.mountpoints,
 						subvol_infos
 					)
 				)

diff --git a/archinstall/lib/disk/device_model.py b/archinstall/lib/disk/device_model.py
@@ -450,11 +450,8 @@ def table_data(self) -> dict[str, str]:
 	def from_partition(
 		cls,
 		partition: Partition,
+		lsblk_info: LsblkInfo,
 		fs_type: FilesystemType | None,
-		partn: int | None,
-		partuuid: str | None,
-		uuid: str | None,  # pylint: disable=redefined-outer-name
-		mountpoints: list[Path],
 		btrfs_subvol_infos: list[_BtrfsSubvolumeInfo] = []
 	) -> _PartitionInfo:
 		partition_type = PartitionType.get_type_from_code(partition.type)
@@ -481,11 +478,11 @@ def from_partition(
 			start=start,
 			length=length,
 			flags=flags,
-			partn=partn,
-			partuuid=partuuid,
-			uuid=uuid,
+			partn=lsblk_info.partn,
+			partuuid=lsblk_info.partuuid,
+			uuid=lsblk_info.uuid,
 			disk=partition.disk,
-			mountpoints=mountpoints,
+			mountpoints=lsblk_info.mountpoints,
 			btrfs_subvol_infos=btrfs_subvol_infos
 		)