From e6c8e66a86b1fe3595fc9d0eb682357d71aaf037 Mon Sep 17 00:00:00 2001 From: Vladislav Nepogodin Date: Fri, 26 Jan 2024 23:30:14 +0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=B9=20remove=20everything=20with=20res?= =?UTF-8?q?olved=20or=20networkd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ipv6-privacy-extensions.conf | 2 -- .../etc/systemd/network/20-ethernet.network | 24 ------------------- .../etc/systemd/network/20-wlan.network | 20 ---------------- .../etc/systemd/network/20-wwan.network | 19 --------------- .../dbus-org.freedesktop.network1.service | 1 - .../dbus-org.freedesktop.resolve1.service | 1 - 6 files changed, 67 deletions(-) delete mode 100644 archiso/airootfs/etc/systemd/network.conf.d/ipv6-privacy-extensions.conf delete mode 100644 archiso/airootfs/etc/systemd/network/20-ethernet.network delete mode 100644 archiso/airootfs/etc/systemd/network/20-wlan.network delete mode 100644 archiso/airootfs/etc/systemd/network/20-wwan.network delete mode 120000 archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.network1.service delete mode 120000 archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.resolve1.service diff --git a/archiso/airootfs/etc/systemd/network.conf.d/ipv6-privacy-extensions.conf b/archiso/airootfs/etc/systemd/network.conf.d/ipv6-privacy-extensions.conf deleted file mode 100644 index 0e9ceb4..0000000 --- a/archiso/airootfs/etc/systemd/network.conf.d/ipv6-privacy-extensions.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Network] -IPv6PrivacyExtensions=yes diff --git a/archiso/airootfs/etc/systemd/network/20-ethernet.network b/archiso/airootfs/etc/systemd/network/20-ethernet.network deleted file mode 100644 index d3a3271..0000000 --- a/archiso/airootfs/etc/systemd/network/20-ethernet.network +++ /dev/null @@ -1,24 +0,0 @@ -[Match] -# Matching with "Type=ether" causes issues with containers because it also matches virtual Ethernet interfaces (veth*). -# See https://bugs.archlinux.org/task/70892 -# Instead match by globbing the network interface name. -Name=en* -Name=eth* - -[Link] -RequiredForOnline=routable - -[Network] -DHCP=yes -MulticastDNS=yes - -# systemd-networkd does not set per-interface-type default route metrics -# https://github.com/systemd/systemd/issues/17698 -# Explicitly set route metric, so that Ethernet is preferred over Wi-Fi and Wi-Fi is preferred over mobile broadband. -# Use values from NetworkManager. From nm_device_get_route_metric_default in -# https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/blob/main/src/core/devices/nm-device.c -[DHCPv4] -RouteMetric=100 - -[IPv6AcceptRA] -RouteMetric=100 diff --git a/archiso/airootfs/etc/systemd/network/20-wlan.network b/archiso/airootfs/etc/systemd/network/20-wlan.network deleted file mode 100644 index 8b70a95..0000000 --- a/archiso/airootfs/etc/systemd/network/20-wlan.network +++ /dev/null @@ -1,20 +0,0 @@ -[Match] -Name=wl* - -[Link] -RequiredForOnline=routable - -[Network] -DHCP=yes -MulticastDNS=yes - -# systemd-networkd does not set per-interface-type default route metrics -# https://github.com/systemd/systemd/issues/17698 -# Explicitly set route metric, so that Ethernet is preferred over Wi-Fi and Wi-Fi is preferred over mobile broadband. -# Use values from NetworkManager. From nm_device_get_route_metric_default in -# https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/blob/main/src/core/devices/nm-device.c -[DHCPv4] -RouteMetric=600 - -[IPv6AcceptRA] -RouteMetric=600 diff --git a/archiso/airootfs/etc/systemd/network/20-wwan.network b/archiso/airootfs/etc/systemd/network/20-wwan.network deleted file mode 100644 index 6e1c8dd..0000000 --- a/archiso/airootfs/etc/systemd/network/20-wwan.network +++ /dev/null @@ -1,19 +0,0 @@ -[Match] -Name=ww* - -[Link] -RequiredForOnline=routable - -[Network] -DHCP=yes - -# systemd-networkd does not set per-interface-type default route metrics -# https://github.com/systemd/systemd/issues/17698 -# Explicitly set route metric, so that Ethernet is preferred over Wi-Fi and Wi-Fi is preferred over mobile broadband. -# Use values from NetworkManager. From nm_device_get_route_metric_default in -# https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/blob/main/src/core/devices/nm-device.c -[DHCPv4] -RouteMetric=700 - -[IPv6AcceptRA] -RouteMetric=700 diff --git a/archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.network1.service b/archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.network1.service deleted file mode 120000 index 4c158e6..0000000 --- a/archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.network1.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/systemd-networkd.service \ No newline at end of file diff --git a/archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.resolve1.service b/archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.resolve1.service deleted file mode 120000 index 4f6ae34..0000000 --- a/archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.resolve1.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/systemd-resolved.service \ No newline at end of file