RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allow multiple services to be enabled at once

This commit is contained in:
Zach Osman 2021-04-05 13:10:35 -04:00
parent 45e61dd83e
commit 0888ca592a
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archinstall/lib/exceptions.py
View File

@ -19,3 +19,5 @@ class PermissionError(BaseException):
pass pass
class UserError(BaseException): class UserError(BaseException):
pass pass
class ServiceException(BaseException):
pass

14
archinstall/lib/installer.py
View File

@ -189,9 +189,11 @@ class Installer():
if self.enable_service('ntpd'): if self.enable_service('ntpd'):
return True return True
def enable_service(self, service): def enable_service(self, *services):
for service in services:
self.log(f'Enabling service {service}', level=LOG_LEVELS.Info) self.log(f'Enabling service {service}', level=LOG_LEVELS.Info)
return self.arch_chroot(f'systemctl enable {service}').exit_code == 0 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): def run_command(self, cmd, *args, **kwargs):
return sys_command(f'/usr/bin/arch-chroot {self.mountpoint} {cmd}') return sys_command(f'/usr/bin/arch-chroot {self.mountpoint} {cmd}')
@ -256,14 +258,12 @@ class Installer():
# If we haven't installed the base yet (function called pre-maturely) # If we haven't installed the base yet (function called pre-maturely)
if self.helper_flags.get('base', False) is False: if self.helper_flags.get('base', False) is False:
def post_install_enable_networkd_resolved(*args, **kwargs): def post_install_enable_networkd_resolved(*args, **kwargs):
self.enable_service('systemd-networkd') self.enable_service('systemd-networkd', 'systemd-resolved')
self.enable_service('systemd-resolved')
self.post_base_install.append(post_install_enable_networkd_resolved) self.post_base_install.append(post_install_enable_networkd_resolved)
# Otherwise, we can go ahead and enable the services # Otherwise, we can go ahead and enable the services
else: else:
self.enable_service('systemd-networkd') self.enable_service('systemd-networkd', 'systemd-resolved')
self.enable_service('systemd-resolved')
return True return True