From 3b849ca07462dd80734373b3428cd0e128812f60 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Tue, 9 Mar 2021 11:38:36 +0100 Subject: Debugging some tweaks --- archinstall/lib/disk.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/archinstall/lib/disk.py b/archinstall/lib/disk.py index 32dbcbc2..335ec42e 100644 --- a/archinstall/lib/disk.py +++ b/archinstall/lib/disk.py @@ -157,10 +157,7 @@ class Partition(): 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): if type(left_comparitor) == Partition: @@ -275,11 +272,11 @@ class Partition(): raise DiskError(f'Could not format {path} with {filesystem} because: {b"".join(handle)}') self.filesystem = 'f2fs' - #elif filesystem == 'crypto_LUKS': + elif filesystem == 'crypto_LUKS': # from .luks import luks2 # encrypted_partition = luks2(self, None, None) # encrypted_partition.format(path) - # self.filesystem = 'crypto_LUKS' + self.filesystem = 'crypto_LUKS' else: raise UnknownFilesystemFormat(f"Fileformat '{filesystem}' is not yet implemented.") -- cgit v1.2.3-70-g09d2