Merge pull request #181 from zosman1/enhancement-systemd-service-wrapper

Allow multiple services to be enabled at once

3 files changed, 20 insertions, 8 deletions

diff --git a/archinstall/lib/exceptions.py b/archinstall/lib/exceptions.py
index a320eef6..49913980 100644
--- a/archinstall/lib/exceptions.py
+++ b/archinstall/lib/exceptions.py
@@ -18,4 +18,6 @@ class HardwareIncompatibilityError(BaseException):
 class PermissionError(BaseException):
 	pass
 class UserError(BaseException):
+	pass
+class ServiceException(BaseException):
 	pass
\ No newline at end of file
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index 92e89f26..4ff9e80a 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -178,9 +178,11 @@ class Installer():
 			if self.enable_service('ntpd'):
 				return True
 
-	def enable_service(self, service):
-		self.log(f'Enabling service {service}', level=LOG_LEVELS.Info)
-		return self.arch_chroot(f'systemctl enable {service}').exit_code == 0
+	def enable_service(self, *services):
+		for service in services:
+			self.log(f'Enabling service {service}', level=LOG_LEVELS.Info)
+			if (output := self.arch_chroot(f'systemctl enable {service}')).exit_code != 0:
+				raise ServiceException(f"Unable to start service {service}: {output}")
 
 	def run_command(self, cmd, *args, **kwargs):
 		return sys_command(f'/usr/bin/arch-chroot {self.target} {cmd}')
@@ -245,14 +247,12 @@ class Installer():
 				# If we haven't installed the base yet (function called pre-maturely)
 				if self.helper_flags.get('base', False) is False:
 					def post_install_enable_networkd_resolved(*args, **kwargs):
-						self.enable_service('systemd-networkd')
-						self.enable_service('systemd-resolved')
-
+						self.enable_service('systemd-networkd', 'systemd-resolved')
 					self.post_base_install.append(post_install_enable_networkd_resolved)
 				# Otherwise, we can go ahead and enable the services
 				else:
-					self.enable_service('systemd-networkd')
-					self.enable_service('systemd-resolved')
+					self.enable_service('systemd-networkd', 'systemd-resolved')
+					
 
 		return True
 
diff --git a/docs/archinstall/general.rst b/docs/archinstall/general.rst
index 312c03af..c3913ea9 100644
--- a/docs/archinstall/general.rst
+++ b/docs/archinstall/general.rst
@@ -91,3 +91,13 @@ Exceptions
 .. autofunction:: archinstall.ProfileError
 
 .. autofunction:: archinstall.SysCallError
+
+.. autofunction:: archinstall.ProfileNotFound
+
+.. autofunction:: archinstall.HardwareIncompatibilityError
+
+.. autofunction:: archinstall.PermissionError
+
+.. autofunction:: archinstall.UserError
+
+.. autofunction:: archinstall.ServiceException