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

More debugging

This commit is contained in:
Lord Anton Hvornum 2018-04-08 13:06:52 +02:00
parent 3059b1d504
commit dff83ac7b8
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
archinstall.py
View File

@ -1,4 +1,5 @@
#!/usr/bin/python3 #!/usr/bin/python3
import traceback
import psutil, os, re, struct, sys, json import psutil, os, re, struct, sys, json
import urllib.request, urllib.parse import urllib.request, urllib.parse
from glob import glob from glob import glob
@ -154,27 +155,34 @@ if __name__ == '__main__':
## == If we got networking, ## == If we got networking,
# Try fetching instructions for this box and execute them. # Try fetching instructions for this box and execute them.
instructions = {}
if get_default_gateway_linux(): if get_default_gateway_linux():
locmac = get_local_MACs() locmac = get_local_MACs()
for mac in locmac: if not len(locmac):
try: print('[N] No network interfaces - No net deploy.')
instructions = grab_url_data('https://raw.githubusercontent.com/Torxed/archinstall/net-deploy/deployments/{}.json'.format(mac)) else:
except urllib.error.HTTPError: for mac in locmac:
print('[N] No instructions for this box on this mac: {}'.format(mac)) try:
continue instructions = grab_url_data('https://raw.githubusercontent.com/Torxed/archinstall/net-deploy/deployments/{}.json'.format(mac))
except urllib.error.HTTPError:
print('[N] No instructions for this box on this mac: {}'.format(mac))
continue
#print('Decoding:', instructions) #print('Decoding:', instructions)
try: try:
instructions = json.loads(instructions.decode('UTF-8'), object_pairs_hook=oDict) instructions = json.loads(instructions.decode('UTF-8'), object_pairs_hook=oDict)
except: except:
print('[E] JSON instructions failed to load for {}'.format(mac)) print('[E] JSON instructions failed to load for {}'.format(mac))
instructions = {} traceback.print_exc()
sleep(5) instructions = {}
continue sleep(5)
continue
if 'args' in instructions: if 'args' in instructions:
for key, val in instructions['args'].items(): for key, val in instructions['args'].items():
args[key] = val args[key] = val
else:
print('[N] No gateway - No net deploy')
print(args) print(args)