From 1fdb64858c3a93b999a8ae22af709fd0da35b080 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Wed, 9 Feb 2022 14:45:08 +0100 Subject: [PATCH] Wrong variable name in usage --- archinstall/__init__.py | 2 ++ archinstall/lib/disk/filesystem.py | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/archinstall/__init__.py b/archinstall/__init__.py index 44ccf1dd..72b6704d 100644 --- a/archinstall/__init__.py +++ b/archinstall/__init__.py @@ -143,6 +143,7 @@ def get_arguments(): """ config = {} args, unknowns = parser.parse_known_args() + # preprocess the json files. # TODO Expand the url access to the other JSON file arguments ? if args.config is not None: @@ -175,6 +176,7 @@ def get_arguments(): # avoiding a compatibility issue if 'dry-run' in config: del config['dry-run'] + return config def load_config(): diff --git a/archinstall/lib/disk/filesystem.py b/archinstall/lib/disk/filesystem.py index 18e5ae76..3e00abb0 100644 --- a/archinstall/lib/disk/filesystem.py +++ b/archinstall/lib/disk/filesystem.py @@ -123,12 +123,11 @@ class Filesystem: else: loopdev = f"{storage.get('ENC_IDENTIFIER', 'ai')}{pathlib.Path(partition['device_instance'].path).name}" - print(storage['arguments']) partition['device_instance'].encrypt( password=partition['!password'], - key_size=storage['arguments']['crypt-key-size'], - hash_type=storage['arguments']['crypt-hash-type'], - iter_time=storage['arguments']['crypt-iter-time'] + key_size=storage['arguments']['crypt_key_size'], + hash_type=storage['arguments']['crypt_hash_type'], + iter_time=storage['arguments']['crypt_iter_time'] ) # Immediately unlock the encrypted device to format the inner volume with luks2(partition['device_instance'], loopdev, partition['!password'], auto_unmount=True) as unlocked_device: