From db24153dd7d610d86909b21c13698ca1675c823a Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Wed, 27 Nov 2019 21:02:53 +0000 Subject: Fixes for transition --- archinstall.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'archinstall.py') diff --git a/archinstall.py b/archinstall.py index 79e4faf8..d4d55021 100644 --- a/archinstall.py +++ b/archinstall.py @@ -1244,6 +1244,20 @@ if __name__ == '__main__': o = b''.join(sys_command('/usr/bin/arch-chroot /mnt sh -c "userdel aibuilder"')) o = b''.join(sys_command('/usr/bin/arch-chroot /mnt sh -c "rm -rf /home/aibuilder"')) + if args['phone-home']: + payload = json.dumps({"hostname": args['hostname'], + "done" : time.time(), + "profile": args['profile'], + "drive": args['drive'], + "base_status": base_return_code + }).encode('utf8') + request = urllib.request.Request(args['phone-home'], + data=payload, + headers={'content-type': 'application/json'}) + response = urllib.request.urlopen(request) + print(response) + time.sleep(2) + ## == Passwords # o = sys_command('arch-chroot /mnt usermod --password {} root'.format(args['password'])) # o = sys_command("arch-chroot /mnt sh -c 'echo {pin} | passwd --stdin root'".format(pin='"{pin}"'.format(**args, pin=args['password'])), echo=True) @@ -1257,17 +1271,3 @@ if __name__ == '__main__': o = simple_command('/usr/bin/reboot now') else: print('Done. "umount -R /mnt; reboot" when you\'re done tinkering.') - - if args['phone-home']: - payload = json.dumps({"hostname": args['hostname'], - "done" : time(), - "profile": args['profile'], - "drive": args['drive'], - "base_status": base_return_code - }).encode('utf8') - request = urllib.request.Request(args['phone-home'], - data=payload, - headers={'content-type': 'application/json'}) - response = urllib.request.urlopen(request) - print(response) - time.sleep(2) \ No newline at end of file -- cgit v1.2.3-70-g09d2