Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archinstall/lib/disk.py1
-rw-r--r--archinstall/lib/luks.py4
2 files changed, 3 insertions, 2 deletions
diff --git a/archinstall/lib/disk.py b/archinstall/lib/disk.py
index fe21dcf7..c05ba757 100644
--- a/archinstall/lib/disk.py
+++ b/archinstall/lib/disk.py
@@ -193,7 +193,6 @@ class Partition():
log(f'Trying to detect inner filesystem format on {self} (This might take a while)', level=LOG_LEVELS.Info)
from .luks import luks2
with luks2(self, 'luksloop', password, auto_unmount=True) as unlocked_device:
- print('Found:', unlocked_device.filesystem)
return unlocked_device.filesystem
def has_content(self):
diff --git a/archinstall/lib/luks.py b/archinstall/lib/luks.py
index 7873f76b..e54641b8 100644
--- a/archinstall/lib/luks.py
+++ b/archinstall/lib/luks.py
@@ -84,7 +84,9 @@ class luks2():
sys_command(f'/usr/bin/cryptsetup open {partition.path} {mountpoint} --key-file {os.path.abspath(key_file)} --type luks2')
if os.path.islink(f'/dev/mapper/{mountpoint}'):
self.mapdev = f'/dev/mapper/{mountpoint}'
- return Partition(self.mapdev, encrypted=True, filesystem=get_filesystem_type(self.mapdev), autodetect_filesystem=False)
+ unlocked_partition = Partition(self.mapdev, encrypted=True, filesystem=get_filesystem_type(self.mapdev), autodetect_filesystem=False)
+ unlocked_partition.allow_formatting = self.partition.allow_formatting
+ return unlocked_partition
def close(self, mountpoint=None):
if not mountpoint: