| index : archinstall32 | |
| Archlinux32 installer | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | archinstall/lib/general.py | 3 | ||||
| -rw-r--r-- | archinstall/lib/installer.py | 2 | ||||
| -rw-r--r-- | examples/guided.py | 2 |
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): diff --git a/examples/guided.py b/examples/guided.py index 2352b749..e8efb6cb 100644 --- a/examples/guided.py +++ b/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) |