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:33:00 +0100
committerAnton Hvornum <anton.feeds+github@gmail.com>2019-11-29 15:33:00 +0100
commitb2f85c93e7a93ad31910902975f408ae106a0bb2 (patch)
tree87590881532605c04fefe4d82623fc5c8b8e1530
parentb4f311584b0f85f66fcbbf20ee8cce10686562d3 (diff)
Fixing bytes conversion on JSON triggers on command lines
-rw-r--r--archinstall.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/archinstall.py b/archinstall.py
index 25b6feb4..62fd88e1 100644
--- a/archinstall.py
+++ b/archinstall.py
@@ -312,6 +312,7 @@ class sys_command():#Thread):
broke = False
if 'events' in self.kwargs:
for trigger in list(self.kwargs['events']):
+ if type(trigger) != bytes: trigger = bytes(trigger, 'UTF-8')
if trigger.lower() in self.trace_log[last_trigger_pos:].lower():
trigger_pos = self.trace_log[last_trigger_pos:].lower().find(trigger.lower())
@@ -1087,7 +1088,7 @@ def run_post_install_steps(*positionals, **kwargs):
o = simple_command("cd /mnt; mount -t proc /proc proc")
o = simple_command("cd /mnt; mount --make-rslave --rbind /sys sys")
o = simple_command("cd /mnt; mount --make-rslave --rbind /dev dev")
- o = simple_command('chroot /mnt /bin/bash -c "{c}"'.format(c=command), events=opts)
+ o = simple_command('chroot /mnt /bin/bash -c "{c}"'.format(c=command), opts=opts)
o = simple_command("cd /mnt; umount -R dev")
o = simple_command("cd /mnt; umount -R sys")
o = simple_command("cd /mnt; umount -R proc")