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

Fixing a more transparent argument passing all the way down to the actual command begin executed. Hoping this will enable better error output in the future

This commit is contained in:
Anton Hvornum 2020-03-16 17:51:13 +01:00
parent 940869da6c
commit 20d64e445a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archinstall.py
View File

@ -1168,7 +1168,7 @@ def run_post_install_steps(*positionals, **kwargs):
## `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.
if 'no-chroot' in opts and opts['no-chroot']: if 'no-chroot' in opts and opts['no-chroot']:
log(f'Executing {command} as simple command from live-cd.', level=4, origin='run_post_install_steps') log(f'Executing {command} as simple command from live-cd.', level=4, origin='run_post_install_steps')
o = simple_command(command, opts) o = simple_command(command, opts, *positionals, **kwargs)
elif 'chroot' in opts and opts['chroot']: elif 'chroot' in opts and opts['chroot']:
log(f'Executing {command} in chroot.', level=4, origin='run_post_install_steps') log(f'Executing {command} in chroot.', level=4, origin='run_post_install_steps')
## Run in a manually set up version of arch-chroot (arch-chroot will break namespaces). ## Run in a manually set up version of arch-chroot (arch-chroot will break namespaces).
@ -1179,7 +1179,7 @@ def run_post_install_steps(*positionals, **kwargs):
o = simple_command("cd /mnt; mount -t proc /proc proc") 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 /sys sys")
o = simple_command("cd /mnt; mount --make-rslave --rbind /dev dev") o = simple_command("cd /mnt; mount --make-rslave --rbind /dev dev")
o = simple_command('chroot /mnt /bin/bash -c "{c}"'.format(c=command), opts=opts) o = simple_command('chroot /mnt /bin/bash -c "{c}"'.format(c=command), opts=opts, *positionals, **kwargs)
o = simple_command("cd /mnt; umount -R dev") o = simple_command("cd /mnt; umount -R dev")
o = simple_command("cd /mnt; umount -R sys") o = simple_command("cd /mnt; umount -R sys")
o = simple_command("cd /mnt; umount -R proc") o = simple_command("cd /mnt; umount -R proc")
@ -1210,13 +1210,13 @@ def run_post_install_steps(*positionals, **kwargs):
if not 'events' in opts: opts['events'] = {} if not 'events' in opts: opts['events'] = {}
events = {**defaults, **opts['events']} events = {**defaults, **opts['events']}
del(opts['events']) del(opts['events'])
o = b''.join(sys_command('/usr/bin/systemd-nspawn -D /mnt -b --machine temporary', events=events, **opts)) o = b''.join(sys_command('/usr/bin/systemd-nspawn -D /mnt -b --machine temporary', *positionals, **{'events' : events, **kwargs, **opts}))
## Not needed anymore: And cleanup after out selves.. Don't want to leave any residue.. ## Not needed anymore: And cleanup after out selves.. Don't want to leave any residue..
# os.remove('/mnt/etc/systemd/system/console-getty.service.d/override.conf') # os.remove('/mnt/etc/systemd/system/console-getty.service.d/override.conf')
else: else:
log(f'Executing {command} in with systemd-nspawn without boot.', level=4, origin='run_post_install_steps') log(f'Executing {command} in with systemd-nspawn without boot.', level=4, origin='run_post_install_steps')
o = b''.join(sys_command('/usr/bin/systemd-nspawn -D /mnt --machine temporary {c}'.format(c=command), **opts)) o = b''.join(sys_command(f'/usr/bin/systemd-nspawn -D /mnt --machine temporary {command}', *positionals, **{**kwargs, **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:
log(f'{command} failed: {o.decode("UTF-8")}', level=4, origin='run_post_install_steps') log(f'{command} failed: {o.decode("UTF-8")}', level=4, origin='run_post_install_steps')
print('[W] Post install command failed: {}'.format(o.decode('UTF-8'))) print('[W] Post install command failed: {}'.format(o.decode('UTF-8')))