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

Carried over the allow_formatting from the parent device of luks2() devices.

This commit is contained in:
Anton Hvornum 2021-03-09 14:00:30 +01:00
parent 3e9031821a
commit cf21b47764
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
archinstall/lib/disk.py
View File

@ -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):

4
archinstall/lib/luks.py
View File

@ -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: