index : archinstall32 | |
Archlinux32 installer | gitolite user |
summaryrefslogtreecommitdiff |
author | Anton Hvornum <anton.feeds@gmail.com> | 2019-09-24 15:57:39 +0200 |
---|---|---|
committer | Anton Hvornum <anton.feeds@gmail.com> | 2019-09-24 15:57:39 +0200 |
commit | b66720b001f574630ce37b37bb089863fa0702dc (patch) | |
tree | c10ca06c1a580ebaa812332b78379c556345faee | |
parent | 14a91f5f7ccbe8cc3c157b58c805be9b9bae6c57 (diff) |
-rw-r--r-- | archinstall.py | 4 |
diff --git a/archinstall.py b/archinstall.py index 1420c7b6..7247eb33 100644 --- a/archinstall.py +++ b/archinstall.py @@ -482,7 +482,7 @@ if __name__ == '__main__': 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: drives = list(harddrives.keys()) - if len(drives) > 1 and not ('force' in args or 'first-drive' in args or 'default' 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)") args['drive'] = sorted(drives)[0] # First drive found rerun = args['ignore-rerun'] @@ -587,7 +587,7 @@ if __name__ == '__main__': print(json.dumps(args, indent=4)) if args['default'] and not 'force' in args: if(input('Are these settings OK? (No return beyond this point) N/y: ').lower() != 'y'): - die(1) + exit(1) if not os.path.isfile(args['pwfile']): #PIN = '0000' |