index : archinstall32 | |
Archlinux32 installer | gitolite user |
summaryrefslogtreecommitdiff |
author | Anton Hvornum <anton@hvornum.se> | 2021-04-09 21:50:53 +0200 |
---|---|---|
committer | Anton Hvornum <anton@hvornum.se> | 2021-04-09 21:50:53 +0200 |
commit | 5099376dcdf59cbfcd146f3c2fa92872b2b1920c (patch) | |
tree | 6fd8d46c133caf30f5f222eb1852ede24e691726 /archinstall/lib | |
parent | bd134c5db0f9fb93b51e00b3a2df992715d28d81 (diff) |
-rw-r--r-- | archinstall/lib/disk.py | 4 | ||||
-rw-r--r-- | archinstall/lib/installer.py | 5 |
diff --git a/archinstall/lib/disk.py b/archinstall/lib/disk.py index f6dc16eb..fe06ac00 100644 --- a/archinstall/lib/disk.py +++ b/archinstall/lib/disk.py @@ -215,6 +215,10 @@ class Partition(): self._encrypted = value @property + def parent(self): + return self.real_device + + @property def real_device(self): if not self._encrypted: return self.path diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py index 48ef7259..7fd775b1 100644 --- a/archinstall/lib/installer.py +++ b/archinstall/lib/installer.py @@ -283,8 +283,9 @@ class Installer(): if '/usr/bin/btrfs-progs' not in BINARIES: BINARIES.append('/usr/bin/btrfs') - elif partition.encrypted and 'encrypt' not in HOOKS: - HOOKS.insert(HOOKS.find('filesystems'), 'encrypt') + elif (partition.encrypted or Partition(partition.parent, None).filesystem == 'crypto_LUKS'): + if 'encrypt' not in HOOKS: + HOOKS.insert(HOOKS.find('filesystems'), 'encrypt') self.pacstrap(self.base_packages) self.helper_flags['base-strapped'] = True |