| index : archinstall32 | |
| Archlinux32 installer | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | profiles/deepin.py | 2 | ||||
| -rw-r--r-- | profiles/desktop.py | 7 | ||||
| -rw-r--r-- | profiles/server.py | 5 |
diff --git a/profiles/deepin.py b/profiles/deepin.py index 5bc18285..8196bc4b 100644 --- a/profiles/deepin.py +++ b/profiles/deepin.py @@ -9,7 +9,7 @@ __packages__ = [ "deepin-terminal", "deepin-editor", "lightdm", - "lightdm-gtk-greeter", + "lightdm-deepin-greeter", ] diff --git a/profiles/desktop.py b/profiles/desktop.py index eaf145c2..b9174ac5 100644 --- a/profiles/desktop.py +++ b/profiles/desktop.py @@ -50,12 +50,11 @@ def _prep_function(*args, **kwargs): # Temporarily store the selected desktop profile # in a session-safe location, since this module will get reloaded # the next time it gets executed. - if '_desktop_profile' not in archinstall.storage.keys(): + if not archinstall.storage.get('_desktop_profile', None): archinstall.storage['_desktop_profile'] = desktop - + if not archinstall.arguments.get('desktop-environment', None): + archinstall.arguments['desktop-environment'] = desktop profile = archinstall.Profile(None, desktop) - # Set the resolved profile path to the actual desktop environment - archinstall.arguments['profile'] = profile # Loading the instructions with a custom namespace, ensures that a __name__ comparison is never triggered. with profile.load_instructions(namespace=f"{desktop}.py") as imported: if hasattr(imported, '_prep_function'): diff --git a/profiles/server.py b/profiles/server.py index 79aa9481..731d2005 100644 --- a/profiles/server.py +++ b/profiles/server.py @@ -26,8 +26,9 @@ def _prep_function(*args, **kwargs): Magic function called by the importing installer before continuing any further. """ - selected_servers = archinstall.generic_multi_select(available_servers, "Choose which servers to install and enable (leave blank for a minimal installation): ") - archinstall.storage['_selected_servers'] = selected_servers + if not archinstall.storage.get('_selected_servers', None): + selected_servers = archinstall.generic_multi_select(available_servers, "Choose which servers to install and enable (leave blank for a minimal installation): ") + archinstall.storage['_selected_servers'] = selected_servers return True |