Add provision() to configure users for profiles

Author: codefiles

archinstall/default_profiles/profile.py

@@ -3,6 +3,7 @@
 from enum import Enum, auto
 from typing import TYPE_CHECKING, Self
 
+from archinstall.lib.models.users import User
 from archinstall.lib.translationhandler import tr
 
 if TYPE_CHECKING:
@@ -103,6 +104,13 @@ def post_install(self, install_session: Installer) -> None:
 		are needed
 		"""
 
+	def provision(self, install_session: Installer, users: list[User]) -> None:
+		"""
+		Hook that will be called when the installation process is
+		finished and user configuration for specific default_profiles
+		is needed
+		"""
+
 	def json(self) -> dict[str, str]:
 		"""
 		Returns a json representation of the profile

archinstall/default_profiles/server.py

@@ -4,6 +4,7 @@
 
 from archinstall.default_profiles.profile import Profile, ProfileType, SelectResult
 from archinstall.lib.menu.helpers import Selection
+from archinstall.lib.models.users import User
 from archinstall.lib.output import info
 from archinstall.lib.profile.profiles_handler import profile_handler
 from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup
@@ -53,6 +54,11 @@ def do_on_select(self) -> SelectResult:
 			case ResultType.Reset:
 				return SelectResult.ResetCurrent
 
+	@override
+	def provision(self, install_session: Installer, users: list[User]) -> None:
+		for profile in self.current_selection:
+			profile.provision(install_session, users)
+
 	@override
 	def post_install(self, install_session: Installer) -> None:
 		for profile in self.current_selection:

archinstall/default_profiles/servers/docker.py

@@ -3,6 +3,7 @@
 from typing import TYPE_CHECKING, override
 
 from archinstall.default_profiles.profile import Profile, ProfileType
+from archinstall.lib.models.users import User
 
 if TYPE_CHECKING:
 	from archinstall.lib.installer import Installer
@@ -26,9 +27,6 @@ def services(self) -> list[str]:
 		return ['docker']
 
 	@override
-	def post_install(self, install_session: Installer) -> None:
-		from archinstall.lib.args import arch_config_handler
-
-		if auth_config := arch_config_handler.config.auth_config:
-			for user in auth_config.users:
-				install_session.arch_chroot(f'usermod -a -G docker {user.username}')
+	def provision(self, install_session: Installer, users: list[User]) -> None:
+		for user in users:
+			install_session.arch_chroot(f'usermod -a -G docker {user.username}')

archinstall/scripts/guided.py

@@ -123,8 +123,10 @@ def perform_installation(
 				config.profile_config,
 			)
 
+		users = None
 		if config.auth_config:
 			if config.auth_config.users:
+				users = config.auth_config.users
 				installation.create_users(config.auth_config.users)
 				auth_handler.setup_auth(installation, config.auth_config, config.hostname)
 
@@ -153,6 +155,9 @@ def perform_installation(
 		if (profile_config := config.profile_config) and profile_config.profile:
 			profile_config.profile.post_install(installation)
 
+			if users:
+				profile_config.profile.provision(installation, users)
+
 		# If the user provided a list of services to be enabled, pass the list to the enable_service function.
 		# Note that while it's called enable_service, it can actually take a list of services and iterate it.
 		if services := config.services: