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

Fix _mount_luks_partition() (#2838)

This commit is contained in:
codefiles 2024-11-17 03:40:52 -05:00 committed by GitHub
parent 80ad332d31
commit 68e2d8c3fa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
archinstall/lib/installer.py
View File

@ -337,13 +337,14 @@ class Installer:
self._mount_btrfs_subvol(volume.dev_path, volume.btrfs_subvols, volume.mount_options) self._mount_btrfs_subvol(volume.dev_path, volume.btrfs_subvols, volume.mount_options)
def _mount_luks_partition(self, part_mod: disk.PartitionModification, luks_handler: Luks2) -> None: def _mount_luks_partition(self, part_mod: disk.PartitionModification, luks_handler: Luks2) -> None:
if part_mod.fs_type != disk.FilesystemType.Btrfs: if not luks_handler.mapper_dev:
if part_mod.mountpoint and luks_handler.mapper_dev: return None
target = self.target / part_mod.relative_mountpoint
disk.device_handler.mount(luks_handler.mapper_dev, target, options=part_mod.mount_options)
if part_mod.fs_type == disk.FilesystemType.Btrfs and luks_handler.mapper_dev: if part_mod.fs_type == disk.FilesystemType.Btrfs and part_mod.btrfs_subvols:
self._mount_btrfs_subvol(luks_handler.mapper_dev, part_mod.btrfs_subvols, part_mod.mount_options) self._mount_btrfs_subvol(luks_handler.mapper_dev, part_mod.btrfs_subvols, part_mod.mount_options)
elif part_mod.mountpoint:
target = self.target / part_mod.relative_mountpoint
disk.device_handler.mount(luks_handler.mapper_dev, target, options=part_mod.mount_options)
def _mount_luks_volume(self, volume: disk.LvmVolume, luks_handler: Luks2) -> None: def _mount_luks_volume(self, volume: disk.LvmVolume, luks_handler: Luks2) -> None:
if volume.fs_type != disk.FilesystemType.Btrfs: if volume.fs_type != disk.FilesystemType.Btrfs: