RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Anton Hvornum 2019-04-10 10:46:14 +02:00
parent 6b785a4b4e
commit fe9dfc4ffd
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
archinstall.py
View File

@ -476,7 +476,10 @@ if __name__ == '__main__':
## arch-chroot mounts /run into the chroot environment, this breaks name resolves for some reason. ## 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 ## 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. ## `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: 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('[W] Post install command failed: {}'.format(o.decode('UTF-8')))
#print(o) #print(o)