From 282717eb39b8f46f1696dfa072eef2d64154e834 Mon Sep 17 00:00:00 2001 From: Daniel Girtler Date: Sun, 10 May 2026 15:22:15 +1000 Subject: [PATCH] Update --- archinstall/lib/args.py | 19 ++++++++++++++----- archinstall/lib/configuration.py | 6 +++--- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/archinstall/lib/args.py b/archinstall/lib/args.py index 4a96b5d4..efe9baa2 100644 --- a/archinstall/lib/args.py +++ b/archinstall/lib/args.py @@ -72,6 +72,9 @@ class ArchConfigType(StrEnum): APP_CONFIG = 'app_config' AUTH_CONFIG = 'auth_config' SWAP = 'swap' + USERS = 'users' + ROOT_ENC_PASSWORD = 'root_enc_password' + ENCRYPTION_PASSWORD = 'encryption_password' HOSTNAME = 'hostname' KERNELS = 'kernels' NTP = 'ntp' @@ -123,6 +126,12 @@ class ArchConfigType(StrEnum): return tr('Pacman') case ArchConfigType.CUSTOM_COMMANDS: return tr('Custom commands') + case ArchConfigType.USERS: + return tr('Users') + case ArchConfigType.ROOT_ENC_PASSWORD: + return tr('Root encrypted password') + case ArchConfigType.ENCRYPTION_PASSWORD: + return tr('Disk encryption password') @dataclass @@ -148,20 +157,20 @@ class ArchConfig: services: list[str] = field(default_factory=list) custom_commands: list[str] = field(default_factory=list) - def unsafe_config(self) -> dict[str, Any]: - config: dict[str, list[UserSerialization] | str | None] = {} + def unsafe_config(self) -> dict[ArchConfigType, Any]: + config: dict[ArchConfigType, list[UserSerialization] | str | None] = {} if self.auth_config: if self.auth_config.users: - config['users'] = [user.json() for user in self.auth_config.users] + config[ArchConfigType.USERS] = [user.json() for user in self.auth_config.users] if self.auth_config.root_enc_password: - config['root_enc_password'] = self.auth_config.root_enc_password.enc_password + config[ArchConfigType.ROOT_ENC_PASSWORD] = self.auth_config.root_enc_password.enc_password if self.disk_config: disk_encryption = self.disk_config.disk_encryption if disk_encryption and disk_encryption.encryption_password: - config['encryption_password'] = disk_encryption.encryption_password.plaintext + config[ArchConfigType.ENCRYPTION_PASSWORD] = disk_encryption.encryption_password.plaintext return config diff --git a/archinstall/lib/configuration.py b/archinstall/lib/configuration.py index 8cc2e998..c40ef161 100644 --- a/archinstall/lib/configuration.py +++ b/archinstall/lib/configuration.py @@ -49,10 +49,10 @@ class ConfigurationOutput: return json.dumps(python_dict, indent=4, sort_keys=True) def user_credentials_to_json(self) -> str: - config = self._config.unsafe_config() + cfg = self._config.unsafe_config() - adapter = TypeAdapter(dict[str, Any]) - python_dict = adapter.dump_python(config) + adapter = TypeAdapter(dict[ArchConfigType, Any]) + python_dict = adapter.dump_python(cfg) return json.dumps(python_dict, indent=4, sort_keys=True) def write_debug(self) -> None: