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

Attempting to correct some inconsitencies in disk-parent reporting.

This commit is contained in:
Anton Hvornum 2021-04-09 23:12:47 +02:00
parent c7b2133376
commit e49b73cef4
No known key found for this signature in database
GPG Key ID: F1234C5BA67C59DF
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
archinstall/lib/disk.py
View File

@ -166,6 +166,9 @@ class Partition():
self.mountpoint = target self.mountpoint = target
if not self.filesystem and autodetect_filesystem: if not self.filesystem and autodetect_filesystem:
print(f'Auto-detecting filesystem for: {path}')
print('Mount information:', mount_information.get('fstype', None))
print('Real device:', get_filesystem_type(self.real_device))
if (fstype := mount_information.get('fstype', get_filesystem_type(self.real_device))): if (fstype := mount_information.get('fstype', get_filesystem_type(self.real_device))):
self.filesystem = fstype self.filesystem = fstype

2
archinstall/lib/installer.py
View File

@ -283,7 +283,7 @@ class Installer():
if '/usr/bin/btrfs-progs' not in BINARIES: if '/usr/bin/btrfs-progs' not in BINARIES:
BINARIES.append('/usr/bin/btrfs') BINARIES.append('/usr/bin/btrfs')
if (partition.encrypted or Partition(partition.parent, None, autodetect_filesystem=True).filesystem == 'crypto_LUKS'): if (partition.encrypted or (partition.parent not in partition.path and Partition(partition.parent, None, autodetect_filesystem=True).filesystem == 'crypto_LUKS')):
if 'encrypt' not in HOOKS: if 'encrypt' not in HOOKS:
HOOKS.insert(HOOKS.find('filesystems'), 'encrypt') HOOKS.insert(HOOKS.find('filesystems'), 'encrypt')