RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Anton Hvornum 2021-12-31 12:33:01 +01:00
parent c6b499cf47
commit cad911893d
No known key found for this signature in database
GPG Key ID: F1234C5BA67C59DF
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
archinstall/lib/general.py
View File

@ -284,6 +284,9 @@ class SysCommandWorker:
except UnicodeDecodeError: except UnicodeDecodeError:
return False 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.write(str(output))
sys.stdout.flush() sys.stdout.flush()

2
archinstall/lib/installer.py
View File

@ -186,7 +186,7 @@ class Installer:
for partition in layouts[blockdevice]['partitions']: for partition in layouts[blockdevice]['partitions']:
mountpoints[partition['mountpoint']] = partition 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] partition = mountpoints[mountpoint]
if partition.get('encrypted', False): if partition.get('encrypted', False):

2
examples/guided.py
View File

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