diff --git a/archinstall/lib/models/network.py b/archinstall/lib/models/network.py index b60d6d99..38b2c152 100644 --- a/archinstall/lib/models/network.py +++ b/archinstall/lib/models/network.py @@ -23,7 +23,7 @@ class NicType(Enum): case NicType.NM_IWD: return tr('Use Network Manager (iwd backend)') case NicType.IWD: - return tr('Use iwd standalone (no Network Manager)') + return tr('Use standalone iwd') case NicType.MANUAL: return tr('Manual configuration') diff --git a/archinstall/lib/network/network_handler.py b/archinstall/lib/network/network_handler.py index 45de8303..09d2750c 100644 --- a/archinstall/lib/network/network_handler.py +++ b/archinstall/lib/network/network_handler.py @@ -1,3 +1,5 @@ +import textwrap + from archinstall.lib.installer import Installer from archinstall.lib.models.network import NetworkConfiguration, NicType from archinstall.lib.models.profile import ProfileConfiguration @@ -60,12 +62,27 @@ def _configure_iwd_standalone(installation: Installer) -> None: iwd_conf_dir.mkdir(parents=True, exist_ok=True) main_conf = iwd_conf_dir / 'main.conf' - _ = main_conf.write_text('[General]\nEnableNetworkConfiguration=true\n\n[Network]\nNameResolvingService=systemd\n') + main_conf_content = textwrap.dedent("""\ + [General] + EnableNetworkConfiguration=true + + [Network] + NameResolvingService=systemd + """) + _ = main_conf.write_text(main_conf_content) networkd_dir = installation.target / 'etc/systemd/network' networkd_dir.mkdir(parents=True, exist_ok=True) wired_conf = networkd_dir / '20-wired.network' - _ = wired_conf.write_text('[Match]\nType=ether\nKind=!*\n\n[Network]\nDHCP=yes\n') + wired_conf_content = textwrap.dedent("""\ + [Match] + Type=ether + Kind=!* + + [Network] + DHCP=yes + """) + _ = wired_conf.write_text(wired_conf_content) resolv = installation.target / 'etc/resolv.conf' resolv.unlink(missing_ok=True)