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

Improved sys exec to enable debug output via net deploy

This commit is contained in:
Lord Anton Hvornum 2018-04-08 13:45:30 +02:00
parent cf6f6d94d0
commit 16ff533c81
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
archinstall.py
View File

@ -43,19 +43,20 @@ def get_local_MACs():
macs[addr.address] = nic
return macs
def run(cmd, echo=False, *args, **kwargs):
def run(cmd, echo=False, opts=None, *args, **kwargs):
if not opts: opts = {}
#print('[!] {}'.format(cmd))
handle = Popen(cmd, shell='True', stdout=PIPE, stderr=STDOUT, **kwargs)
output = b''
while handle.poll() is None:
data = handle.stdout.read()
if len(data):
if echo and 'flush':
if echo or 'debug' in opts:
print(data.decode('UTF-8'), end='')
# print(data.decode('UTF-8'), end='')
output += data
data = handle.stdout.read()
if echo:
if echo or 'debug' in opts:
print(data.decode('UTF-8'), end='')
output += data
handle.stdout.close()
@ -297,7 +298,7 @@ if __name__ == '__main__':
opts = conf[title][command] if type(conf[title][command]) in (dict, oDict) else {}
#print('[N] Command: {} ({})'.format(command, opts))
o = run('arch-chroot /mnt {c}'.format(c=command), **opts)
o = run('arch-chroot /mnt {c}'.format(c=command), opts)
if type(conf[title][command]) == bytes and len(conf[title][command]) and not conf[title][command] in o:
print('[W] Post install command failed: {}'.format(o.decode('UTF-8')))
#print(o)