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

Update

This commit is contained in:
Daniel Girtler 2026-05-10 15:22:15 +10:00
parent 58dadccd2c
commit 282717eb39
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
archinstall/lib/args.py
View File

@ -72,6 +72,9 @@ class ArchConfigType(StrEnum):
APP_CONFIG = 'app_config' APP_CONFIG = 'app_config'
AUTH_CONFIG = 'auth_config' AUTH_CONFIG = 'auth_config'
SWAP = 'swap' SWAP = 'swap'
USERS = 'users'
ROOT_ENC_PASSWORD = 'root_enc_password'
ENCRYPTION_PASSWORD = 'encryption_password'
HOSTNAME = 'hostname' HOSTNAME = 'hostname'
KERNELS = 'kernels' KERNELS = 'kernels'
NTP = 'ntp' NTP = 'ntp'
@ -123,6 +126,12 @@ class ArchConfigType(StrEnum):
return tr('Pacman') return tr('Pacman')
case ArchConfigType.CUSTOM_COMMANDS: case ArchConfigType.CUSTOM_COMMANDS:
return tr('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 @dataclass
@ -148,20 +157,20 @@ class ArchConfig:
services: list[str] = field(default_factory=list) services: list[str] = field(default_factory=list)
custom_commands: list[str] = field(default_factory=list) custom_commands: list[str] = field(default_factory=list)
def unsafe_config(self) -> dict[str, Any]: def unsafe_config(self) -> dict[ArchConfigType, Any]:
config: dict[str, list[UserSerialization] | str | None] = {} config: dict[ArchConfigType, list[UserSerialization] | str | None] = {}
if self.auth_config: if self.auth_config:
if self.auth_config.users: 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: 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: if self.disk_config:
disk_encryption = self.disk_config.disk_encryption disk_encryption = self.disk_config.disk_encryption
if disk_encryption and disk_encryption.encryption_password: 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 return config

6
archinstall/lib/configuration.py
View File

@ -49,10 +49,10 @@ class ConfigurationOutput:
return json.dumps(python_dict, indent=4, sort_keys=True) return json.dumps(python_dict, indent=4, sort_keys=True)
def user_credentials_to_json(self) -> str: def user_credentials_to_json(self) -> str:
config = self._config.unsafe_config() cfg = self._config.unsafe_config()
adapter = TypeAdapter(dict[str, Any]) adapter = TypeAdapter(dict[ArchConfigType, Any])
python_dict = adapter.dump_python(config) python_dict = adapter.dump_python(cfg)
return json.dumps(python_dict, indent=4, sort_keys=True) return json.dumps(python_dict, indent=4, sort_keys=True)
def write_debug(self) -> None: def write_debug(self) -> None: