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

Merge pull request #17 from Torxed/experimental 

Enhanced the multi-drive prompt a little bit
This commit is contained in:
Anton Hvornum 2019-09-24 16:07:17 +02:00 committed by GitHub
parent 0b59fe245b 865d79a2aa
commit fae0045c74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
archinstall.py
View File

@ -481,10 +481,15 @@ if __name__ == '__main__':
if not 'ignore-rerun' in args: args['ignore-rerun'] = False if not 'ignore-rerun' in args: args['ignore-rerun'] = False
if not 'localtime' in args: args['localtime'] = 'Europe/Stockholm' if args['country'] == 'SE' else 'GMT+0' # TODO: Arbitrary for now if not 'localtime' in args: args['localtime'] = 'Europe/Stockholm' if args['country'] == 'SE' else 'GMT+0' # TODO: Arbitrary for now
if not 'drive' in args: if not 'drive' in args:
drives = list(harddrives.keys()) drives = sorted(list(harddrives.keys()))
if len(drives) > 1 and 'force' not in args and ('default' in args and 'first-drive' not in args): if len(drives) > 1 and 'force' not in args and ('default' in args and 'first-drive' not in args):
raise KeyError("Multiple disks found, --drive=/dev/X not specified (or --force/--first-drive)") for index, drive in enumerate(drives):
args['drive'] = sorted(drives)[0] # First drive found print(f'{index}: {drive} ({harddrives[drive]})')
drive = input('Select one of the above disks (by number): ')
if not drive.isdigit():
raise KeyError("Multiple disks found, --drive=/dev/X not specified (or --force/--first-drive)")
drives = [drives[int(drive)]] # Make sure only the selected drive is in the list of options
args['drive'] = drives[0] # First drive found
rerun = args['ignore-rerun'] rerun = args['ignore-rerun']
if args['drive'][0] != '/': if args['drive'][0] != '/':