Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/lib/disk/device_handler.py
diff options
context:
space:
mode:
authorcodefiles <11915375+codefiles@users.noreply.github.com>2023-10-02 01:50:20 -0400
committerGitHub <noreply@github.com>2023-10-02 07:50:20 +0200
commit8257e9f73f6d8f233731b5632863a5d7a4ae827e (patch)
tree1d53dc1174e8e8519619c668b50ea9db76b28658 /archinstall/lib/disk/device_handler.py
parent71048721ecc7b06b227080688bbf02950ffc1942 (diff)
Fix missing info for pre-mounted disk configuration (#2143)
Diffstat (limited to 'archinstall/lib/disk/device_handler.py')
-rw-r--r--archinstall/lib/disk/device_handler.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/archinstall/lib/disk/device_handler.py b/archinstall/lib/disk/device_handler.py
index f2835b7b..6927671d 100644
--- a/archinstall/lib/disk/device_handler.py
+++ b/archinstall/lib/disk/device_handler.py
@@ -83,7 +83,9 @@ class DeviceHandler(object):
_PartitionInfo.from_partition(
partition,
fs_type,
+ lsblk_info.partn,
lsblk_info.partuuid,
+ lsblk_info.uuid,
lsblk_info.mountpoints,
subvol_infos
)
@@ -598,7 +600,12 @@ class DeviceHandler(object):
path = Path(part_info.disk.device.path)
part_mods.setdefault(path, [])
part_mod = PartitionModification.from_existing_partition(part_info)
- part_mod.mountpoint = mountpoint.root / mountpoint.relative_to(base_mountpoint)
+ if part_mod.mountpoint:
+ part_mod.mountpoint = mountpoint.root / mountpoint.relative_to(base_mountpoint)
+ else:
+ for subvol in part_mod.btrfs_subvols:
+ if sm := subvol.mountpoint:
+ subvol.mountpoint = sm.root / sm.relative_to(base_mountpoint)
part_mods[path].append(part_mod)
break