summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2024-01-18 15:46:07 +0100
committerSimon Rettberg2024-01-18 15:46:07 +0100
commitafc5779927532e310326da9da3ad75fe4a415321 (patch)
tree7c0ff4385634263933cec8004246d1060faf2dd5
parent[idleaction] Delete rm of unused flag-file (diff)
downloadmltk-afc5779927532e310326da9da3ad75fe4a415321.tar.gz
mltk-afc5779927532e310326da9da3ad75fe4a415321.tar.xz
mltk-afc5779927532e310326da9da3ad75fe4a415321.zip
[dhcpc-busybox] Don't start via udev for additional nics
This depends on having SLX_DHCP_OTHER_NICS enabled.
-rw-r--r--core/modules/dhcpc-busybox/data/etc/udev/rules.d/99-openslx-net.rules5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/modules/dhcpc-busybox/data/etc/udev/rules.d/99-openslx-net.rules b/core/modules/dhcpc-busybox/data/etc/udev/rules.d/99-openslx-net.rules
index de91cee9..0a48662e 100644
--- a/core/modules/dhcpc-busybox/data/etc/udev/rules.d/99-openslx-net.rules
+++ b/core/modules/dhcpc-busybox/data/etc/udev/rules.d/99-openslx-net.rules
@@ -3,6 +3,7 @@
# by systemd and ignores further add events. So if you think this problem doesn't exist anymore, make sure
# you're not just lucky and not hitting this issue, and also make sure you understand what the initial problem
# was. I assume it's something to with switching from initrd to final root, but this isn't worth the effort tbh.
-#ACTION=="add", SUBSYSTEM=="net", KERNEL=="br0|br-nic-*", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/sys/subsystem/net/devices/$name", ENV{SYSTEMD_WANTS}="network-interface@$name.service"
+#ACTION=="add", SUBSYSTEM=="net", KERNEL=="br0", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/sys/subsystem/net/devices/$name", ENV{SYSTEMD_WANTS}="network-interface@$name.service"
# So use a more crude approach that triggers every time (consecutive invocations shouldn't do anything)
-ACTION=="add", SUBSYSTEM=="net", KERNEL=="br0|br-nic-*", RUN+="/bin/systemctl --no-block start network-interface@$name.service"
+ACTION=="add", SUBSYSTEM=="net", KERNEL=="br0", RUN+="/bin/systemctl --no-block start network-interface@$name.service"
+# Also don't match br-nic-* here, it's conditionally started via systemd-bridge_additional_nics