From 8d4a62e504e98f89ad7b80850ac3b280af9a9b49 Mon Sep 17 00:00:00 2001 From: kpcyrd Date: Mon, 16 May 2022 08:23:15 +0000 Subject: Add network-manager-applet to NetworkManager profile (#1120) * Add network-manager-applet to NetworkManager profile * Converted _configuration.is_desktop_profile() into profile.is_desktop_profile Co-authored-by: Anton Hvornum --- archinstall/lib/models/network_configuration.py | 5 ++++- archinstall/lib/profiles.py | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'archinstall/lib') diff --git a/archinstall/lib/models/network_configuration.py b/archinstall/lib/models/network_configuration.py index 16136177..4f135da5 100644 --- a/archinstall/lib/models/network_configuration.py +++ b/archinstall/lib/models/network_configuration.py @@ -5,6 +5,7 @@ from enum import Enum from typing import List, Optional, Dict, Union, Any, TYPE_CHECKING from ..output import log +from ..storage import storage if TYPE_CHECKING: _: Any @@ -77,7 +78,9 @@ class NetworkConfigurationHandler: installation.copy_iso_network_config( enable_services=True) # Sources the ISO network configuration to the install medium. elif self._configuration.is_network_manager(): - installation.add_additional_packages("networkmanager") + installation.add_additional_packages(["networkmanager"]) + if (profile := storage['arguments'].get('profile')) and profile.is_desktop_profile: + installation.add_additional_packages(["network-manager-applet"]) installation.enable_service('NetworkManager.service') def _backwards_compability_config(self, config: Union[str,Dict[str, str]]) -> Union[List[NetworkConfiguration], NetworkConfiguration, None]: diff --git a/archinstall/lib/profiles.py b/archinstall/lib/profiles.py index 33214ee8..a4fbe490 100644 --- a/archinstall/lib/profiles.py +++ b/archinstall/lib/profiles.py @@ -211,6 +211,10 @@ class Profile(Script): def name(self) -> str: return os.path.basename(self.profile) + @property + def is_desktop_profile(self) -> bool: + return is_desktop_profile(repr(self)) + def install(self) -> ModuleType: # Before installing, revert any temporary changes to the namespace. # This ensures that the namespace during installation is the original initiation namespace. -- cgit v1.2.3-70-g09d2