Attempting to correct some inconsitencies in disk-parent reporting.

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')