From eb0ae8b1c35e421f88b7eabcc445d1069969ba76 Mon Sep 17 00:00:00 2001
From: Anton Hvornum <anton@hvornum.se>
Date: Fri, 9 Apr 2021 11:53:54 +0200
Subject: Added disk helper function get_partitions_in_use(). Which returns
 which partions are being used at a given mount location, including children.

---
 archinstall/lib/disk.py      | 18 ++++++++++++++++++
 archinstall/lib/installer.py |  1 +
 2 files changed, 19 insertions(+)

(limited to 'archinstall')

diff --git a/archinstall/lib/disk.py b/archinstall/lib/disk.py
index f0fe7181..af40e36f 100644
--- a/archinstall/lib/disk.py
+++ b/archinstall/lib/disk.py
@@ -574,6 +574,24 @@ def get_mount_info(path):
 
 		return output['filesystems'][0]
 
+def get_partitions_in_use(mountpoint):
+	try:
+		output = b''.join(sys_command(f'/usr/bin/findmnt --json -R {path}'))
+	except SysCallError:
+		return {}
+
+	mounts = []
+
+	output = output.decode('UTF-8')
+	output = json.loads(output)
+	for target in output.get('filesystems', []):
+		mounts.append(Partition(target['source'], filesystem=target.get('fstype', None), mountpoint=target['target']))
+
+		for child in target.get('children', []):
+			mounts.append(Partition(child['source'], filesystem=child.get('fstype', None), mountpoint=child['target']))
+
+	return mounts
+
 def get_filesystem_type(path):
 	try:
 		handle = sys_command(f"blkid -o value -s TYPE {path}")
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index 11f75f99..d17ee77c 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -49,6 +49,7 @@ class Installer():
 
 		storage['session'] = self
 		self.partitions = get_partitions_in_use(self.target)
+		print(self.partitions)
 
 	def log(self, *args, level=LOG_LEVELS.Debug, **kwargs):
 		"""
-- 
cgit v1.2.3-70-g09d2