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

Editing more outputs

This commit is contained in:
Anton Hvornum 2019-04-11 21:18:16 +02:00
parent 80d7fca43d
commit 5b44456a55
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
archinstall.py
View File

@ -249,7 +249,10 @@ def grab_partitions(dev):
## and make sys_command() return the exit-code, way safer than checking output strings :P ## and make sys_command() return the exit-code, way safer than checking output strings :P
return {} return {}
print(o) if not o[:1] == b'{':
print('[E] Error in getting blk devices:', o)
exit(1)
r = json.loads(o.decode('UTF-8')) r = json.loads(o.decode('UTF-8'))
if len(r['blockdevices']) and 'children' in r['blockdevices'][0]: if len(r['blockdevices']) and 'children' in r['blockdevices'][0]:
for part in r['blockdevices'][0]['children']: for part in r['blockdevices'][0]['children']:
@ -460,8 +463,9 @@ if __name__ == '__main__':
# "--cipher sha512" breaks the shit. # "--cipher sha512" breaks the shit.
# TODO: --use-random instead of --use-urandom # TODO: --use-random instead of --use-urandom
print('[N] Adding encryption to {drive}{partition_2}.'.format(**args)) print('[N] Adding encryption to {drive}{partition_2}.'.format(**args))
o = sys_command('/usr/bin/cryptsetup -q -v --type luks2 --pbkdf argon2i --hash sha512 --key-size 512 --iter-time 10000 --key-file {pwfile} --use-urandom luksFormat {drive}{partition_2}'.format(**args)).exec() o = b''.join(sys_command('/usr/bin/cryptsetup -q -v --type luks2 --pbkdf argon2i --hash sha512 --key-size 512 --iter-time 10000 --key-file {pwfile} --use-urandom luksFormat {drive}{partition_2}'.format(**args)).exec())
if not 'Command successful.' in b''.join(o).decode('UTF-8').strip(): print(o)
if not b'Command successful.' in o:
print('[E] Failed to setup disk encryption.', o) print('[E] Failed to setup disk encryption.', o)
exit(1) exit(1)