Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hvornum <anton.feeds+github@gmail.com>2019-11-29 15:25:27 +0100
committerAnton Hvornum <anton.feeds+github@gmail.com>2019-11-29 15:25:27 +0100
commitb4f311584b0f85f66fcbbf20ee8cce10686562d3 (patch)
treec3ae0f4f2a5c2b8c5ca46d26ba90cc61051b4a0b
parentb0804b41d00ec6f58d14f23e864cd290a489acd8 (diff)
Fixing argument for boot command
-rw-r--r--archinstall.py14
1 files changed, 9 insertions, 5 deletions
diff --git a/archinstall.py b/archinstall.py
index 05361fab..25b6feb4 100644
--- a/archinstall.py
+++ b/archinstall.py
@@ -1109,11 +1109,15 @@ def run_post_install_steps(*positionals, **kwargs):
## "<hostname> login" followed by "Passwodd" in case it's been set in a previous step.. usually this shouldn't be nessecary
## 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', events={
- bytes(f'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))
+ defaults = {
+ bytes(f'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'),
+ }
+ if not 'events' in opts: opts['events'] = {}
+ events = {**defaults, **opts['events']}
+ del(opts['events'])
+ o = b''.join(sys_command('/usr/bin/systemd-nspawn -D /mnt -b --machine temporary', events=events, **opts))
## Not needed anymore: And cleanup after out selves.. Don't want to leave any residue..
# os.remove('/mnt/etc/systemd/system/console-getty.service.d/override.conf')