From 379113a015ae93f06917224c6040eb1119fe7754 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Thu, 20 Jun 2019 18:52:46 +0000 Subject: Fixing some logic issues in sys_command --- archinstall.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'archinstall.py') diff --git a/archinstall.py b/archinstall.py index 0b5d3843..41e3feec 100644 --- a/archinstall.py +++ b/archinstall.py @@ -177,12 +177,13 @@ class sys_command(): print('[N] Writing to subsystem: {}'.format(self.opts['triggers'][trigger].decode('UTF-8'))) os.write(child_fd, self.opts['triggers'][trigger]) del(self.opts['triggers'][trigger]) + break ## Adding a exit trigger: if len(self.opts['triggers']) == 0: if 'debug' in self.opts and self.opts['debug']: print('[N] Waiting for last command to finish...') - if bytes(f'[root@{args["hostname"]} ~]#'.lower(), 'UTF-8') in output.lower(): + if bytes(f'[root@{args["hostname"]} ~]#'.lower(), 'UTF-8') in output[-len(f'[root@{args["hostname"]} ~]#')-5:].lower(): if 'debug' in self.opts and self.opts['debug']: print('[N] Last command finished, exiting subsystem.') alive = False -- cgit v1.2.3-70-g09d2