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

more debug

This commit is contained in:
Lord Anton Hvornum 2018-04-07 14:09:25 +02:00
parent 22f4963dd2
commit 17c810d897
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
archinstall.py
View File

@ -41,13 +41,15 @@ def get_local_MACs():
macs[addr.address] = nic macs[addr.address] = nic
return macs return macs
def run(cmd): def run(cmd, echo=False):
#print('[!] {}'.format(cmd)) #print('[!] {}'.format(cmd))
handle = Popen(cmd, shell='True', stdout=PIPE, stderr=STDOUT) handle = Popen(cmd, shell='True', stdout=PIPE, stderr=STDOUT)
output = b'' output = b''
while handle.poll() is None: while handle.poll() is None:
data = handle.stdout.read() data = handle.stdout.read()
if len(data): if len(data):
if echo:
print(data.decode('UTF-8', end=''))
# print(data.decode('UTF-8'), end='') # print(data.decode('UTF-8'), end='')
output += data output += data
output += handle.stdout.read() output += handle.stdout.read()
@ -253,13 +255,14 @@ if __name__ == '__main__':
print('[N] No instructions for this box on this mac: {}'.format(mac)) print('[N] No instructions for this box on this mac: {}'.format(mac))
continue continue
print('Decoding:', instructions) #print('Decoding:', instructions)
instructions = json.loads(instructions.decode('UTF-8'), object_pairs_hook=oDict) instructions = json.loads(instructions.decode('UTF-8'), object_pairs_hook=oDict)
for title in instructions: for title in instructions:
print('[N] {}'.format(title)) print('[N] {}'.format(title))
for command in instructions[title]: for command in instructions[title]:
o = run('arch-chroot /mnt {c}'.format(c=command)) print('[N] Command: {}'.format(command))
o = run('arch-chroot /mnt {c}'.format(c=command), echo=True)
if instructions[title][command] and not instructions[title][command] in o: if instructions[title][command] and not instructions[title][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)