installer: Make sure networkd and resolved are enabled

Fixed the logic so systemd-networkd and systemd-resolved will always be enabled when the user
picks the option to copy files from the ISO. The previous behavior was to enable them only if
a wireless network was configured with iwd.
This commit is contained in:
Giancarlo Razzolini 2021-01-26 10:18:56 -03:00
parent 30e66e49ec
commit 66293c15f6
No known key found for this signature in database
GPG Key ID: F22FB1D78A77AEAB
1 changed files with 13 additions and 4 deletions

View File

@ -224,8 +224,6 @@ class Installer():
# base is not installed yet.
def post_install_enable_iwd_service(*args, **kwargs):
self.enable_service('iwd')
self.enable_service('systemd-networkd')
self.enable_service('systemd-resolved')
self.post_base_install.append(post_install_enable_iwd_service)
# Otherwise, we can go ahead and add the required package
@ -233,8 +231,6 @@ class Installer():
else:
self.pacstrap('iwd')
self.enable_service('iwd')
self.enable_service('systemd-networkd')
self.enable_service('systemd-resolved')
for psk in psk_files:
shutil.copy2(psk, f"{self.mountpoint}/var/lib/iwd/{os.path.basename(psk)}")
@ -247,6 +243,19 @@ class Installer():
for netconf_file in netconfigurations:
shutil.copy2(netconf_file, f"{self.mountpoint}/etc/systemd/network/{os.path.basename(netconf_file)}")
if enable_services:
# 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.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')
return True
def minimal_installation(self):