From b2476313a7284fedc7a29ec17fc5090a1c985ae9 Mon Sep 17 00:00:00 2001 From: Yash Tripathi Date: Sun, 18 Jul 2021 21:17:20 +0530 Subject: added new key for desktop-environment --- profiles/desktop.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'profiles') diff --git a/profiles/desktop.py b/profiles/desktop.py index eaf145c2..457283e9 100644 --- a/profiles/desktop.py +++ b/profiles/desktop.py @@ -52,10 +52,8 @@ def _prep_function(*args, **kwargs): # the next time it gets executed. if '_desktop_profile' not in archinstall.storage.keys(): archinstall.storage['_desktop_profile'] = desktop - + 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'): -- cgit v1.2.3-70-g09d2 From a67a2693dbda2f8c4e75a39f73bd6c9e38257b4d Mon Sep 17 00:00:00 2001 From: Yash Tripathi Date: Sun, 18 Jul 2021 22:41:18 +0530 Subject: fixed profile selection --- profiles/desktop.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'profiles') diff --git a/profiles/desktop.py b/profiles/desktop.py index 457283e9..b9174ac5 100644 --- a/profiles/desktop.py +++ b/profiles/desktop.py @@ -50,9 +50,10 @@ 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 - archinstall.arguments['desktop-environment'] = desktop + if not archinstall.arguments.get('desktop-environment', None): + archinstall.arguments['desktop-environment'] = desktop profile = archinstall.Profile(None, desktop) # 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: -- cgit v1.2.3-70-g09d2 From a1667a25f1e1e133a2058220964907c511e52850 Mon Sep 17 00:00:00 2001 From: Felix Yan Date: Sat, 24 Jul 2021 20:41:35 +0800 Subject: Remove lightdm packages from Deepin profile As of deepin-session-shell 5.4.42-2 (which is in the deepin group), lightdm is added as a dependency because of lightdm-deepin-greeter. A configuration (usr/share/lightdm/lightdm.conf.d/60-deepin.conf) in startdde (also in the deepin group) should override default lightdm configuration to use lightdm-deepin-greeter instead of the gtk greeter. Thus these two packages could be removed from the profile now. This effectively reverts #441 --- profiles/deepin.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'profiles') diff --git a/profiles/deepin.py b/profiles/deepin.py index 5bc18285..09b05ed5 100644 --- a/profiles/deepin.py +++ b/profiles/deepin.py @@ -8,8 +8,6 @@ __packages__ = [ "deepin", "deepin-terminal", "deepin-editor", - "lightdm", - "lightdm-gtk-greeter", ] -- cgit v1.2.3-70-g09d2 From 339e9f8a427d2f9c4f9a09fd17760dd2aedf15ea Mon Sep 17 00:00:00 2001 From: Felix Yan Date: Thu, 5 Aug 2021 15:23:50 +0800 Subject: Add back lightdm, be more explicit --- profiles/deepin.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'profiles') diff --git a/profiles/deepin.py b/profiles/deepin.py index 09b05ed5..8196bc4b 100644 --- a/profiles/deepin.py +++ b/profiles/deepin.py @@ -8,6 +8,8 @@ __packages__ = [ "deepin", "deepin-terminal", "deepin-editor", + "lightdm", + "lightdm-deepin-greeter", ] -- cgit v1.2.3-70-g09d2 From c461cc49e756332578e99404fa757a5610f0992c Mon Sep 17 00:00:00 2001 From: Yash Tripathi Date: Fri, 20 Aug 2021 03:54:23 +0530 Subject: only prompt if _selected_servers is not set --- profiles/server.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'profiles') 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 -- cgit v1.2.3-70-g09d2