Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Girtler <blackrabbit256@gmail.com>2023-05-07 16:40:44 +1000
committerGitHub <noreply@github.com>2023-05-07 08:40:44 +0200
commitc0a7d45a83a8a6a8a7497362364d899a7ae8843d (patch)
treeedff38cf55450d085d45a05d31b6ac22aeacc69a
parent525c94bf36edcc47b9af4d025785ec9681e3aa37 (diff)
Fix 1792 (#1795)
Co-authored-by: Daniel Girtler <girtler.daniel@gmail.com>
-rw-r--r--archinstall/default_profiles/applications/pipewire.py2
-rw-r--r--archinstall/default_profiles/servers/docker.py2
-rw-r--r--archinstall/lib/configuration.py2
-rw-r--r--archinstall/lib/global_menu.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/archinstall/default_profiles/applications/pipewire.py b/archinstall/default_profiles/applications/pipewire.py
index 5d2e5ea3..4cb75968 100644
--- a/archinstall/default_profiles/applications/pipewire.py
+++ b/archinstall/default_profiles/applications/pipewire.py
@@ -27,7 +27,7 @@ class PipewireProfile(Profile):
]
def _enable_pipewire_for_all(self, install_session: 'Installer'):
- users: Union[User, List[User]] = archinstall.arguments.get('!users', None)
+ users: Union[User, List[User]] = archinstall.arguments.get('!users', [])
if not isinstance(users, list):
users = [users]
diff --git a/archinstall/default_profiles/servers/docker.py b/archinstall/default_profiles/servers/docker.py
index e6e17831..f4800916 100644
--- a/archinstall/default_profiles/servers/docker.py
+++ b/archinstall/default_profiles/servers/docker.py
@@ -25,7 +25,7 @@ class DockerProfile(Profile):
return ['docker']
def post_install(self, install_session: 'Installer'):
- users: Union[User, List[User]] = archinstall.arguments.get('!users', None)
+ users: Union[User, List[User]] = archinstall.arguments.get('!users', [])
if not isinstance(users, list):
users = [users]
diff --git a/archinstall/lib/configuration.py b/archinstall/lib/configuration.py
index 77fed755..22c41c0d 100644
--- a/archinstall/lib/configuration.py
+++ b/archinstall/lib/configuration.py
@@ -29,7 +29,7 @@ class ConfigurationOutput:
self._user_config_file = 'user_configuration.json'
self._user_creds_file = "user_credentials.json"
- self._sensitive = ['!users']
+ self._sensitive = ['!users', '!root-password']
self._ignore = ['abort', 'install', 'config', 'creds', 'dry_run']
self._process_config()
diff --git a/archinstall/lib/global_menu.py b/archinstall/lib/global_menu.py
index db7af63b..a969d93f 100644
--- a/archinstall/lib/global_menu.py
+++ b/archinstall/lib/global_menu.py
@@ -107,7 +107,7 @@ class GlobalMenu(AbstractMenu):
Selector(
_('User account'),
lambda x: self._create_user_account(x),
- default={},
+ default=[],
display_func=lambda x: f'{len(x)} {_("User(s)")}' if len(x) > 0 else None,
preview_func=self._prev_users)
self._menu_options['profile_config'] = \