From 0c27146f05fb7c35efca56abf4d95aa97df759ff Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Mon, 1 Oct 2018 20:58:32 +0200 Subject: Fixed output success parsing Some times cryptsetup added more info to the command line output. --- archinstall.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/archinstall.py b/archinstall.py index 0f3182e9..48d3a399 100644 --- a/archinstall.py +++ b/archinstall.py @@ -305,7 +305,7 @@ if __name__ == '__main__': # TODO: --use-random instead of --use-urandom print('[N] Adding encryption to {drive}{partition_2}.'.format(**args)) o = run('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)) - if not o.decode('UTF-8').strip() == 'Command successful.': + if not 'Command successful.' in o.decode('UTF-8').strip(): print('[E] Failed to setup disk encryption.', o) exit(1) -- cgit v1.2.3-70-g09d2