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

Deduplicate enabling systemd-resolved stub mode (#4669)

This commit is contained in:
codefiles 2026-07-27 08:05:20 -04:00 committed by GitHub
parent fe16238983
commit bb0df33556
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
archinstall/lib/installer.py
View File

@ -774,6 +774,15 @@ class Installer:
with open(f'{self.target}/etc/systemd/network/10-{nic.iface}.network', 'a') as netconf:
netconf.write(str(conf))
def systemd_resolved_stub_mode(self) -> None:
"""
Enable systemd-resolved stub mode by (forcefully) setting a symlink
For further details see https://wiki.archlinux.org/title/Systemd-resolved#DNS
"""
resolv = self.target / 'etc/resolv.conf'
resolv.unlink(missing_ok=True)
resolv.symlink_to('/run/systemd/resolve/stub-resolv.conf')
def copy_iso_network_config(self, enable_services: bool = False) -> bool:
# Copy (if any) iwd password and config files
iwd_dir = LPath('/var/lib/iwd')
@ -802,11 +811,7 @@ class Installer:
self.pacman.strap('iwd')
self.enable_service('iwd')
# Enable systemd-resolved by (forcefully) setting a symlink
# For further details see https://wiki.archlinux.org/title/Systemd-resolved#DNS
resolv_config_path = self.target / 'etc/resolv.conf'
resolv_config_path.unlink(missing_ok=True)
resolv_config_path.symlink_to('/run/systemd/resolve/stub-resolv.conf')
self.systemd_resolved_stub_mode()
# Copy (if any) systemd-networkd config files
network_dir = LPath('/etc/systemd/network')

4
archinstall/lib/network/network_handler.py
View File

@ -84,6 +84,4 @@ def _configure_iwd_standalone(installation: Installer) -> None:
""")
_ = wired_conf.write_text(wired_conf_content)
resolv = installation.target / 'etc/resolv.conf'
resolv.unlink(missing_ok=True)
resolv.symlink_to('/run/systemd/resolve/stub-resolv.conf')
installation.systemd_resolved_stub_mode()