Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hvornum <anton.feeds@gmail.com>2019-06-20 18:52:46 +0000
committerAnton Hvornum <anton.feeds@gmail.com>2019-06-20 18:52:46 +0000
commit379113a015ae93f06917224c6040eb1119fe7754 (patch)
treee1362fd66be203e9e599ed937ba1ac49df49754c
parentbc7feda018dbfa12fcabcf3c19e36e478f319499 (diff)
Fixing some logic issues in sys_command
-rw-r--r--archinstall.py3
1 files changed, 2 insertions, 1 deletions
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