From fe9dfc4ffd7310d056d27e87ac4c45790b913885 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Wed, 10 Apr 2019 10:46:14 +0200 Subject: Added no-chroot option to commands, so that they can run outside in the live-cd environment. Mainly to fix a temporary issue with systemd-nspawn where I don't know how to redirect stdout etc using the command --- archinstall.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/archinstall.py b/archinstall.py index 479e7c8f..941838cf 100644 --- a/archinstall.py +++ b/archinstall.py @@ -476,7 +476,10 @@ if __name__ == '__main__': ## arch-chroot mounts /run into the chroot environment, this breaks name resolves for some reason. ## Either skipping mounting /run and using traditional chroot is an option, but using ## `systemd-nspawn -D /mnt --machine temporary` might be a more flexible solution in case of file structure changes. - o = run('systemd-nspawn -D /mnt --machine temporary "{c}"'.format(c=command), opts) + if 'no-chroot' in opts and opts['no-chroot']: + o = run(command, opts) + else: + o = run('systemd-nspawn -D /mnt --machine temporary "{c}"'.format(c=command), opts) if type(conf[title][raw_command]) == bytes and len(conf[title][raw_command]) and not conf[title][raw_command] in o: print('[W] Post install command failed: {}'.format(o.decode('UTF-8'))) #print(o) -- cgit v1.2.3-70-g09d2