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

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

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

examples/guided.py

@@ -97,7 +97,7 @@ def ask_user_questions():
 	if archinstall.arguments.get('harddrives', None) is None:
 		archinstall.arguments['harddrives'] = archinstall.select_harddrives()
 
-	if archinstall.arguments.get('harddrives', None) is not None and archinstall.storage.get('disk_layouts', None) is None:
+	if archinstall.arguments.get('harddrives', None) and archinstall.storage.get('disk_layouts', None) is None:
 		archinstall.storage['disk_layouts'] = archinstall.select_disk_layout(archinstall.arguments['harddrives'], archinstall.arguments.get('advanced', False))
 
 	# Get disk encryption password (or skip if blank)