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

Fixes for transition

This commit is contained in:
Anton Hvornum 2019-11-27 21:22:16 +00:00
parent db24153dd7
commit bc154eacbe
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
archinstall.py
View File

@ -739,6 +739,15 @@ def merge_dicts(d1, d2, before=True, overwrite=False):
def random_string(l): def random_string(l):
return ''.join(choice(ascii_uppercase + ascii_lowercase + digits) for i in range(l)) return ''.join(choice(ascii_uppercase + ascii_lowercase + digits) for i in range(l))
def phone_home(url):
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(url, data=payload, headers={'content-type': 'application/json'})
response = urllib.request.urlopen(request)
def setup_args_defaults(args, interactive=True): def setup_args_defaults(args, interactive=True):
if not 'size' in args: args['size'] = '100%' if not 'size' in args: args['size'] = '100%'
if not 'start' in args: args['start'] = '513MiB' if not 'start' in args: args['start'] = '513MiB'
@ -752,6 +761,7 @@ def setup_args_defaults(args, interactive=True):
if not 'profile' in args: args['profile'] = None if not 'profile' in args: args['profile'] = None
if not 'profiles-path' in args: args['profiles-path'] = profiles_path if not 'profiles-path' in args: args['profiles-path'] = profiles_path
if not 'rerun' in args: args['rerun'] = None if not 'rerun' in args: args['rerun'] = None
if not 'aur-keep' in args: args['aur-keep'] = False
if not 'aur-support' in args: args['aur-support'] = True # Support adds yay (https://github.com/Jguer/yay) in installation steps. if not 'aur-support' in args: args['aur-support'] = True # Support adds yay (https://github.com/Jguer/yay) in installation steps.
if not 'ignore-rerun' in args: args['ignore-rerun'] = False if not 'ignore-rerun' in args: args['ignore-rerun'] = False
if not 'localtime' in args: args['localtime'] = 'Europe/Stockholm' if args['country'] == 'SE' else 'GMT+0' # TODO: Arbitrary for now if not 'localtime' in args: args['localtime'] = 'Europe/Stockholm' if args['country'] == 'SE' else 'GMT+0' # TODO: Arbitrary for now
@ -1228,8 +1238,10 @@ if __name__ == '__main__':
exit(1) exit(1)
if not args['rerun'] or rerun: if not args['rerun'] or rerun:
print('[N] Configuring base system.')
configure_base_system() configure_base_system()
## WORKAROUND: https://github.com/systemd/systemd/issues/13603#issuecomment-552246188 ## WORKAROUND: https://github.com/systemd/systemd/issues/13603#issuecomment-552246188
print('[N] Setting up bootloader.')
setup_bootloader() setup_bootloader()
if args['aur-support']: if args['aur-support']:
@ -1237,26 +1249,17 @@ if __name__ == '__main__':
add_AUR_support() add_AUR_support()
print('[N] AUR support added. use "yay -Syy --noconfirm <package>" to deploy in POST.') print('[N] AUR support added. use "yay -Syy --noconfirm <package>" to deploy in POST.')
print('[N] Running post installation steps.')
run_post_install_steps() run_post_install_steps()
time.sleep(2)
if args['aur-support']: if args['aur-support'] and not args['aur-keep']:
o = b''.join(sys_command('/usr/bin/sed -i \'s/%wheel ALL=(ALL) NO/# %wheel ALL=(ALL) NO/\' /mnt/etc/sudoers')) o = b''.join(sys_command('/usr/bin/sed -i \'s/%wheel ALL=(ALL) NO/# %wheel ALL=(ALL) NO/\' /mnt/etc/sudoers'))
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 "userdel aibuilder"'))
o = b''.join(sys_command('/usr/bin/arch-chroot /mnt sh -c "rm -rf /home/aibuilder"')) o = b''.join(sys_command('/usr/bin/arch-chroot /mnt sh -c "rm -rf /home/aibuilder"'))
if args['phone-home']: if args['phone-home']:
payload = json.dumps({"hostname": args['hostname'], phone_home(args['phone-home'])
"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 ## == Passwords
# o = sys_command('arch-chroot /mnt usermod --password {} root'.format(args['password'])) # o = sys_command('arch-chroot /mnt usermod --password {} root'.format(args['password']))