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

Merge pull request #100 from grazzolini/fix_enable_services 

installer: Make sure networkd and resolved are enabled
This commit is contained in:
Anton Hvornum 2021-01-26 14:49:12 +01:00 committed by GitHub
parent 467878813e 66293c15f6
commit b2edfa4ee3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
archinstall/lib/installer.py
View File

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