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

Verified a working network install, removing debugs

This commit is contained in:
Lord Anton Hvornum 2018-04-07 22:48:14 +02:00
parent 36d024b803
commit 13a1c2ab3a
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
archinstall.py
View File

@ -48,12 +48,14 @@ def run(cmd, echo=False, *args, **kwargs):
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: if echo and 'flush':
print(data.decode('UTF-8'), end='') 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() data = handle.stdout.read()
print('Command done:', output, handle.poll()) if echo:
print(data.decode('UTF-8'), end='')
output += data
handle.stdout.close() handle.stdout.close()
return output return output
@ -159,6 +161,7 @@ if __name__ == '__main__':
with open(args['pwfile'], 'r') as pw: with open(args['pwfile'], 'r') as pw:
PIN = pw.read().strip() PIN = pw.read().strip()
print()
print('[!] Disk PASSWORD is: {}'.format(PIN)) print('[!] Disk PASSWORD is: {}'.format(PIN))
print() print()
print('[N] Setting up {drive}.'.format(**args)) print('[N] Setting up {drive}.'.format(**args))
@ -213,11 +216,13 @@ if __name__ == '__main__':
o = run("arch-chroot /mnt sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen") o = run("arch-chroot /mnt sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen")
o = run('arch-chroot /mnt locale-gen') o = run('arch-chroot /mnt locale-gen')
o = run('arch-chroot /mnt chmod 700 /root') o = run('arch-chroot /mnt chmod 700 /root')
## == Passwords
#o = run('arch-chroot /mnt usermod --password {} root'.format(PIN)) #o = run('arch-chroot /mnt usermod --password {} root'.format(PIN))
#TODO: This doesn't work either: (why the hell not?) #TODO: This doesn't work either: (why the hell not?)
# echo "newpass" | passwd --stdin root ? # echo "newpass" | passwd --stdin root ?
#o = run("arch-chroot /mnt echo 'root:{pin}' | chpasswd".format(**args, pin=PIN)) #o = run("arch-chroot /mnt echo 'root:{pin}' | chpasswd".format(**args, pin=PIN))
o = run("arch-chroot /mnt 'echo {pin} | passwd --stdin root".format(pin='"{pin}"'.format(**args, pin=PIN))) o = run("arch-chroot /mnt sh -c 'echo {pin} | passwd --stdin root'".format(pin='"{pin}"'.format(**args, pin=PIN)), echo=True)
if 'user' in args: if 'user' in args:
o = run('arch-chroot /mnt useradd -m -G wheel {user}'.format(**args)) o = run('arch-chroot /mnt useradd -m -G wheel {user}'.format(**args))
o = run("arch-chroot /mnt echo '{user}:{pin}' | chpasswd".format(**args, pin=PIN)) o = run("arch-chroot /mnt echo '{user}:{pin}' | chpasswd".format(**args, pin=PIN))
@ -265,7 +270,7 @@ if __name__ == '__main__':
opts = instructions[title][command] if type(instructions[title][command]) in (dict, oDict) else {} opts = instructions[title][command] if type(instructions[title][command]) in (dict, oDict) else {}
print('[N] Command: {} ({})'.format(command, opts)) print('[N] Command: {} ({})'.format(command, opts))
o = run('arch-chroot /mnt {c}'.format(c=command), echo=True, **opts) o = run('arch-chroot /mnt {c}'.format(c=command), **opts)
if type(instructions[title][command]) == bytes and len(instructions[title][command]) and not instructions[title][command] in o: if type(instructions[title][command]) == bytes and len(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)