| index : archinstall32 | |
| Archlinux32 installer | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | archinstall/__init__.py | 17 |
diff --git a/archinstall/__init__.py b/archinstall/__init__.py index e496d213..9de4a3ec 100644 --- a/archinstall/__init__.py +++ b/archinstall/__init__.py @@ -47,7 +47,7 @@ from .lib.configuration import * from .lib.udev import udevadm_info parser = ArgumentParser() -__version__ = "2.5.2" +__version__ = "2.5.4" storage['__version__'] = __version__ # add the custome _ as a builtin, it can now be used anywhere in the @@ -221,11 +221,8 @@ def load_config(): selected_region = arguments.get('mirror-region', None) arguments['mirror-region'] = {selected_region: list_mirrors()[selected_region]} - if arguments.get('sys-language', None) is not None: - arguments['sys-language'] = arguments.get('sys-language', 'en_US') - - if arguments.get('sys-encoding', None) is not None: - arguments['sys-encoding'] = arguments.get('sys-encoding', 'utf-8') + arguments.setdefault('sys-language', 'en_US') + arguments.setdefault('sys-encoding', 'utf-8') if arguments.get('gfx_driver', None) is not None: storage['gfx_driver_packages'] = AVAILABLE_GFX_DRIVERS.get(arguments.get('gfx_driver', None), None) @@ -243,6 +240,14 @@ def load_config(): superusers = arguments.get('!superusers', None) arguments['!users'] = User.parse_arguments(users, superusers) + if arguments.get('disk_encryption', None) is not None and arguments.get('disk_layouts', None) is not None: + password = arguments.get('encryption_password', '') + arguments['disk_encryption'] = DiskEncryption.parse_arg( + arguments['disk_layouts'], + arguments['disk_encryption'], + password + ) + def post_process_arguments(arguments): storage['arguments'] = arguments |