From afc5779927532e310326da9da3ad75fe4a415321 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Thu, 18 Jan 2024 15:46:07 +0100 Subject: [dhcpc-busybox] Don't start via udev for additional nics This depends on having SLX_DHCP_OTHER_NICS enabled. --- .../modules/dhcpc-busybox/data/etc/udev/rules.d/99-openslx-net.rules | 5 +++-- 1 file 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 -- cgit v1.2.3-55-g7522