From 40440e575caf28d55cead7c16871e03cd9afc0c1 Mon Sep 17 00:00:00 2001
From: Anton Hvornum <anton@hvornum.se>
Date: Sun, 14 Mar 2021 15:25:41 +0100
Subject: Added some error handling.

---
 archinstall/lib/disk.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'archinstall')

diff --git a/archinstall/lib/disk.py b/archinstall/lib/disk.py
index 0e76cb0e..d7dfd9f4 100644
--- a/archinstall/lib/disk.py
+++ b/archinstall/lib/disk.py
@@ -193,8 +193,12 @@ class Partition():
 	def detect_inner_filesystem(self, password):
 		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:
-			return unlocked_device.filesystem
+
+		try:
+			with luks2(self, 'luksloop', password, auto_unmount=True) as unlocked_device:
+				return unlocked_device.filesystem
+		except SysCallError:
+			return None
 
 	def has_content(self):
 		temporary_mountpoint = '/tmp/'+hashlib.md5(bytes(f"{time.time()}", 'UTF-8')+os.urandom(12)).hexdigest()
-- 
cgit v1.2.3-54-g00ecf