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

Debugging some tweaks

This commit is contained in:
Anton Hvornum 2021-03-09 11:36:15 +01:00
parent 56d673d2a5
commit c56d4d958e
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
archinstall/lib/disk.py
View File

@ -146,7 +146,7 @@ class Partition():
self.mount(mountpoint) self.mount(mountpoint)
mount_information = get_mount_info(self.path) mount_information = get_mount_info(self.path)
fstype = get_filesystem_type(self.real_device) # blkid -o value -s TYPE self.path fstype = get_filesystem_type(self.real_devicecryptse) # blkid -o value -s TYPE self.path
if self.mountpoint != mount_information.get('target', None) and mountpoint: if self.mountpoint != mount_information.get('target', None) and mountpoint:
raise DiskError(f"{self} was given a mountpoint but the actual mountpoint differs: {mount_information.get('target', None)}") raise DiskError(f"{self} was given a mountpoint but the actual mountpoint differs: {mount_information.get('target', None)}")
@ -156,6 +156,12 @@ class Partition():
if (fstype := mount_information.get('fstype', fstype)): if (fstype := mount_information.get('fstype', fstype)):
self.filesystem = fstype self.filesystem = fstype
if self.filesystem == 'crypto_LUKS':
# TODO: Explore other options in terms of handling a two-layer filesystem option.
# Currently if we keep crypto_LUKS then the installer won't know what to format inside.
self.encrypted = True
self.filesystem = None
def __lt__(self, left_comparitor): def __lt__(self, left_comparitor):
if type(left_comparitor) == Partition: if type(left_comparitor) == Partition:
left_comparitor = left_comparitor.path left_comparitor = left_comparitor.path
@ -269,11 +275,11 @@ class Partition():
raise DiskError(f'Could not format {path} with {filesystem} because: {b"".join(handle)}') raise DiskError(f'Could not format {path} with {filesystem} because: {b"".join(handle)}')
self.filesystem = 'f2fs' self.filesystem = 'f2fs'
elif filesystem == 'crypto_LUKS': #elif filesystem == 'crypto_LUKS':
from .luks import luks2 # from .luks import luks2
encrypted_partition = luks2(self, None, None) # encrypted_partition = luks2(self, None, None)
encrypted_partition.format(path) # encrypted_partition.format(path)
self.filesystem = 'crypto_LUKS' # self.filesystem = 'crypto_LUKS'
else: else:
raise UnknownFilesystemFormat(f"Fileformat '{filesystem}' is not yet implemented.") raise UnknownFilesystemFormat(f"Fileformat '{filesystem}' is not yet implemented.")