Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hvornum <anton@hvornum.se>2021-04-09 23:12:47 +0200
committerAnton Hvornum <anton@hvornum.se>2021-04-09 23:12:47 +0200
commite49b73cef41b39e0046a8dc10fddfc4337255a5b (patch)
tree332e58daac1ca9759814bbbbebd39ce0d0392e6a
parentc7b213337613ed586bed24486440b4635054b57d (diff)
Attempting to correct some inconsitencies in disk-parent reporting.
-rw-r--r--archinstall/lib/disk.py3
-rw-r--r--archinstall/lib/installer.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/archinstall/lib/disk.py b/archinstall/lib/disk.py
index 1f0e584a..d0d7d4ea 100644
--- a/archinstall/lib/disk.py
+++ b/archinstall/lib/disk.py
@@ -166,6 +166,9 @@ class Partition():
self.mountpoint = target
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))):
self.filesystem = fstype
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index a60955b7..8adc3515 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -283,7 +283,7 @@ class Installer():
if '/usr/bin/btrfs-progs' not in BINARIES:
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:
HOOKS.insert(HOOKS.find('filesystems'), 'encrypt')