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

Enhancing trigger values

This commit is contained in:
Anton Hvornum 2019-11-29 16:53:47 +01:00
parent 3769a3193b
commit cefe7e4f8b
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
archinstall.py
View File

@ -317,7 +317,12 @@ class sys_command():#Thread):
broke = False broke = False
if 'events' in self.kwargs: if 'events' in self.kwargs:
for trigger in list(self.kwargs['events']): for trigger in list(self.kwargs['events']):
if type(trigger) != bytes: trigger = bytes(trigger, 'UTF-8') if type(trigger) != bytes:
key = self.kwargs['events'][trigger]
del(self.kwargs['events'][trigger])
trigger = bytes(key, 'UTF-8')
self.kwargs['events'][trigger] = self.kwargs['events'][key]
if trigger.lower() in self.trace_log[last_trigger_pos:].lower(): if trigger.lower() in self.trace_log[last_trigger_pos:].lower():
trigger_pos = self.trace_log[last_trigger_pos:].lower().find(trigger.lower()) trigger_pos = self.trace_log[last_trigger_pos:].lower().find(trigger.lower())
@ -325,6 +330,8 @@ class sys_command():#Thread):
log(f"Writing to subprocess {self.cmd[0]}: {self.kwargs['events'][trigger].decode('UTF-8')}", origin='spawn', level=5) log(f"Writing to subprocess {self.cmd[0]}: {self.kwargs['events'][trigger].decode('UTF-8')}", origin='spawn', level=5)
last_trigger_pos = trigger_pos last_trigger_pos = trigger_pos
if type(self.kwargs['events'][trigger]) != bytes:
self.kwargs['events'][trigger] = bytes(self.kwargs['events'][trigger], 'UTF-8')
os.write(child_fd, self.kwargs['events'][trigger]) os.write(child_fd, self.kwargs['events'][trigger])
del(self.kwargs['events'][trigger]) del(self.kwargs['events'][trigger])
broke = True broke = True
@ -1117,7 +1124,7 @@ def run_post_install_steps(*positionals, **kwargs):
## [root@<hostname> ~]# ## [root@<hostname> ~]#
defaults = { defaults = {
'login:' : 'root\n', 'login:' : 'root\n',
#b'Password:' : bytes(args['password']+'\n', #'Password:' : args['password']+'\n',
'[root@{args["hostname"]} ~]#' : command+'\n', '[root@{args["hostname"]} ~]#' : command+'\n',
} }
if not 'events' in opts: opts['events'] = {} if not 'events' in opts: opts['events'] = {}