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

Enhanced sys_command

This commit is contained in:
Anton Hvornum 2019-06-20 20:33:18 +00:00
parent ce53fa3faf
commit d1b9a3fc7e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
archinstall.py
View File

@ -193,7 +193,7 @@ class sys_command():
if len(self.opts['triggers']) == 0: if len(self.opts['triggers']) == 0:
if 'debug' in self.opts and self.opts['debug']: if 'debug' in self.opts and self.opts['debug']:
print('[N] Waiting for last command to finish...') print('[N] Waiting for last command to finish...')
if bytes(f'[root@{args["hostname"]} ~]#'.lower(), 'UTF-8') in trace_log[-len(f'[root@{args["hostname"]} ~]#')-5:].lower(): if bytes(f'[root@{args["hostname"]} ~]#'.lower(), 'UTF-8') in trace_log[0-len(f'[root@{args["hostname"]} ~]#')-5:].lower():
if 'debug' in self.opts and self.opts['debug']: if 'debug' in self.opts and self.opts['debug']:
print('[N] Last command finished, exiting subsystem.') print('[N] Last command finished, exiting subsystem.')
alive = False alive = False
@ -226,21 +226,23 @@ class sys_command():
# We need to flush the output of shutdown now, otherwise the # We need to flush the output of shutdown now, otherwise the
# Popen() handle will hang and we'll never exit out of os.waitpid() later on. # Popen() handle will hang and we'll never exit out of os.waitpid() later on.
last = time() alive = True
while time()-last < 5: while alive:
for fileno, event in poller.poll(0.1): for fileno, event in poller.poll(0.1):
try: try:
output = os.read(child_fd, 8192).strip() output = os.read(child_fd, 8192).strip()
trace_log += output trace_log += output
except OSError: except OSError:
last = time() - 60 alive = False
break break
if 'debug' in self.opts and self.opts['debug']: if 'debug' in self.opts and self.opts['debug']:
if len(output): if len(output):
print(output) print(output)
last = time() if b'Container temporary has been shutdown.' in trace_log[0-len('Container temporary has been shutdown.')-5:]:
alive = False
break
if 'debug' in self.opts and self.opts['debug']: if 'debug' in self.opts and self.opts['debug']:
print('[N] Waiting for exit code.') print('[N] Waiting for exit code.')