Skip to content

Commit 076e2a7

Browse files
committed
disk: change from_partition() parameters
1 parent a8c2a5a commit 076e2a7

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

archinstall/lib/disk/device_handler.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,8 @@ def load_devices(self) -> None:
109109
partition_infos.append(
110110
_PartitionInfo.from_partition(
111111
partition,
112+
lsblk_info,
112113
fs_type,
113-
lsblk_info.partn,
114-
lsblk_info.partuuid,
115-
lsblk_info.uuid,
116-
lsblk_info.mountpoints,
117114
subvol_infos
118115
)
119116
)

archinstall/lib/disk/device_model.py

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -450,11 +450,8 @@ def table_data(self) -> dict[str, str]:
450450
def from_partition(
451451
cls,
452452
partition: Partition,
453+
lsblk_info: LsblkInfo,
453454
fs_type: FilesystemType | None,
454-
partn: int | None,
455-
partuuid: str | None,
456-
uuid: str | None, # pylint: disable=redefined-outer-name
457-
mountpoints: list[Path],
458455
btrfs_subvol_infos: list[_BtrfsSubvolumeInfo] = []
459456
) -> _PartitionInfo:
460457
partition_type = PartitionType.get_type_from_code(partition.type)
@@ -481,11 +478,11 @@ def from_partition(
481478
start=start,
482479
length=length,
483480
flags=flags,
484-
partn=partn,
485-
partuuid=partuuid,
486-
uuid=uuid,
481+
partn=lsblk_info.partn,
482+
partuuid=lsblk_info.partuuid,
483+
uuid=lsblk_info.uuid,
487484
disk=partition.disk,
488-
mountpoints=mountpoints,
485+
mountpoints=lsblk_info.mountpoints,
489486
btrfs_subvol_infos=btrfs_subvol_infos
490487
)
491488

0 commit comments

Comments
 (0)