Bringing in changes from v2.3.1-dev branch. This fixes a selection of things mentioned in #819.

2 files changed, 4 insertions, 1 deletions

diff --git a/archinstall/lib/general.py b/archinstall/lib/general.py
index ea0bafc9..7c8f8ea3 100644
--- a/archinstall/lib/general.py
+++ b/archinstall/lib/general.py
@@ -284,6 +284,9 @@ class SysCommandWorker:
 				except UnicodeDecodeError:
 					return False
 
+			with open(f"{storage['LOG_PATH']}/cmd_output.txt", "a") as peak_output_log:
+				peak_output_log.write(output)
+
 			sys.stdout.write(str(output))
 			sys.stdout.flush()
 
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index 3b2e3bd1..d2d30c85 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -186,7 +186,7 @@ class Installer:
 			for partition in layouts[blockdevice]['partitions']:
 				mountpoints[partition['mountpoint']] = partition
 
-		for mountpoint in sorted(mountpoints.keys()):
+		for mountpoint in sorted([mnt_dest for mnt_dest in mountpoints.keys() if mnt_dest != None]):
 			partition = mountpoints[mountpoint]
 
 			if partition.get('encrypted', False):