Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall.py
diff options
context:
space:
mode:
authorAnton Hvornum <anton.feeds@gmail.com>2019-04-10 10:46:14 +0200
committerAnton Hvornum <anton.feeds@gmail.com>2019-04-10 10:46:14 +0200
commitfe9dfc4ffd7310d056d27e87ac4c45790b913885 (patch)
treec2f8f85ed9cae98ce1fb6f549aa1201d95e26672 /archinstall.py
parent6b785a4b4e56b5f2fd36f1fbfcb4f9724f3c487e (diff)
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
Diffstat (limited to 'archinstall.py')
-rw-r--r--archinstall.py5
1 files changed, 4 insertions, 1 deletions
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)