Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall.py
diff options
context:
space:
mode:
authorAnton Hvornum <anton.feeds@gmail.com>2019-06-09 20:25:20 +0200
committerAnton Hvornum <anton.feeds@gmail.com>2019-06-09 20:25:20 +0200
commit9b1310ead83bcbcc9327436c62b0edc5e5d91b67 (patch)
tree7f39553e9c841b6799ce368824a899083da70886 /archinstall.py
parentd0de593976a913c9b6f1742f5f960c65ca740d7c (diff)
Added sorted drives and partition debug information
Diffstat (limited to 'archinstall.py')
-rw-r--r--archinstall.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/archinstall.py b/archinstall.py
index 9fb0f22c..72ba3dc4 100644
--- a/archinstall.py
+++ b/archinstall.py
@@ -397,7 +397,7 @@ if __name__ == '__main__':
exit(1)
## Setup some defaults (in case no command-line parameters or netdeploy-params were given)
- if not 'drive' in args: args['drive'] = list(harddrives.keys())[0] # First drive found
+ if not 'drive' in args: args['drive'] = sorted(list(harddrives.keys()))[0] # First drive found
if not 'size' in args: args['size'] = '100%'
if not 'start' in args: args['start'] = '513MiB'
if not 'pwfile' in args: args['pwfile'] = '/tmp/diskpw'
@@ -526,6 +526,9 @@ if __name__ == '__main__':
o = b''.join(sys_command('/usr/bin/parted -s {drive} mkpart primary {start} {size}'.format(**args)).exec())
args['paritions'] = grab_partitions(args['drive'])
+ print(f'Partitions: (Boot: {list(args['paritions'].keys())[0]})')
+ print(json.dumps(args['paritions'], indent=4))
+
if len(args['paritions']) <= 0:
print('[E] No paritions were created on {drive}'.format(**args), o)
exit(1)
@@ -720,8 +723,8 @@ if __name__ == '__main__':
## since we set the password as the last step. And then the command itself which will be executed by looking for:
## [root@<hostname> ~]#
o = b''.join(sys_command('/usr/bin/systemd-nspawn -D /mnt -b --machine temporary', opts={'triggers' : {
- bytes(f'login:', 'UTF-8') : b'root\n', # {args["hostname"]} login:
- #b'Password' : bytes(args['password']+'\n', 'UTF-8'),
+ bytes(f'{args["hostname"]} login', 'UTF-8') : b'root\n',
+ b'Password' : bytes(args['password']+'\n', 'UTF-8'),
bytes(f'[root@{args["hostname"]} ~]#', 'UTF-8') : bytes(command+'\n', 'UTF-8'),
}, **opts}).exec())