From c38131e959aed97ad8ad800daf42ce2dfc21c4c0 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 1 Oct 2020 14:26:06 +0200
Subject: [systemd] Move network-interface service/udevrule to dhcpc-busybox

---
 .../systemd/data/etc/systemd/system/network-interface@.service   | 9 ---------
 core/modules/systemd/data/usr/lib/udev/rules.d/99-systemd.rules  | 1 -
 2 files changed, 10 deletions(-)
 delete mode 100644 core/modules/systemd/data/etc/systemd/system/network-interface@.service

(limited to 'core/modules/systemd')

diff --git a/core/modules/systemd/data/etc/systemd/system/network-interface@.service b/core/modules/systemd/data/etc/systemd/system/network-interface@.service
deleted file mode 100644
index c566eda1..00000000
--- a/core/modules/systemd/data/etc/systemd/system/network-interface@.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Brings interface %i up
-Wants=dhcpc@%i.service
-Before=dhcpc@%i.service
-
-[Service]
-Type=oneshot
-ExecStart=/opt/openslx/sbin/ip link set dev %i up
-
diff --git a/core/modules/systemd/data/usr/lib/udev/rules.d/99-systemd.rules b/core/modules/systemd/data/usr/lib/udev/rules.d/99-systemd.rules
index 77ef9615..3306c195 100644
--- a/core/modules/systemd/data/usr/lib/udev/rules.d/99-systemd.rules
+++ b/core/modules/systemd/data/usr/lib/udev/rules.d/99-systemd.rules
@@ -33,7 +33,6 @@ SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UUID}=="CRYPT-*", ENV{ID_PART_T
 
 SUBSYSTEM=="net", KERNEL=="eth*", TAG=="openslxignore", GOTO="systemd_end"
 
-SUBSYSTEM=="net", KERNEL=="br0|br-nic-*", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/sys/subsystem/net/devices/$name", ENV{SYSTEMD_WANTS}="network-interface@$name.service"
 SUBSYSTEM=="bluetooth", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/sys/subsystem/bluetooth/devices/%k"
 
 SUBSYSTEM=="bluetooth", TAG+="systemd", ENV{SYSTEMD_WANTS}="bluetooth.target"
-- 
cgit v1.2.3-55-g7522