B #216: More specific detach NIC workarounds

Closes #216
4 years ago · 5a7b1f53e7
parent 9b98a6ada8
commit 5a7b1f53e7
4 changed files with 4 additions and 0 deletions
--- a/src/lib/udev/rules.d/65-context.rules##apk.one
+++ b/src/lib/udev/rules.d/65-context.rules##apk.one
@ -2,6 +2,7 @@
 # https://github.com/OpenNebula/one/issues/4130
 # https://github.com/OpenNebula/one/issues/4194
 SUBSYSTEM=="net", ACTION=="remove", \
+  ENV{ID_BUS}=="?*", \
  RUN+="/bin/sh -c 'test -f /var/run/one-context/context.sh.local && echo >> /var/run/one-context/context.sh.local; test -f /var/run/one-context/context.sh.network && echo >> /var/run/one-context/context.sh.network'"

 # On NIC hotplug the delayed reconfiguration is triggered.
--- a/src/lib/udev/rules.d/65-context.rules##deb.one
+++ b/src/lib/udev/rules.d/65-context.rules##deb.one
@ -2,6 +2,7 @@
 # https://github.com/OpenNebula/one/issues/4130
 # https://github.com/OpenNebula/one/issues/4194
 SUBSYSTEM=="net", ACTION=="remove", \
+  ENV{ID_BUS}=="?*", \
  RUN+="/bin/sh -c 'test -f /var/run/one-context/context.sh.local && echo >> /var/run/one-context/context.sh.local; test -f /var/run/one-context/context.sh.network && echo >> /var/run/one-context/context.sh.network'"

 # On NIC hotplug the delayed reconfiguration is triggered.
--- a/src/lib/udev/rules.d/65-context.rules##rpm.systemd.one
+++ b/src/lib/udev/rules.d/65-context.rules##rpm.systemd.one
@ -2,6 +2,7 @@
 # https://github.com/OpenNebula/one/issues/4130
 # https://github.com/OpenNebula/one/issues/4194
 SUBSYSTEM=="net", ACTION=="remove", \
+  ENV{ID_BUS}=="?*", \
  RUN+="/bin/sh -c 'test -f /var/run/one-context/context.sh.local && echo >> /var/run/one-context/context.sh.local; test -f /var/run/one-context/context.sh.network && echo >> /var/run/one-context/context.sh.network'"

 # On NIC hotplug the delayed reconfiguration is triggered.
--- a/src/lib/udev/rules.d/65-context.rules##rpm.sysv.one
+++ b/src/lib/udev/rules.d/65-context.rules##rpm.sysv.one
@ -2,6 +2,7 @@
 # https://github.com/OpenNebula/one/issues/4130
 # https://github.com/OpenNebula/one/issues/4194
 SUBSYSTEM=="net", ACTION=="remove", \
+  ENV{INTERFACE}=="eth*", \
  RUN+="/bin/sh -c 'test -f /var/run/one-context/context.sh.local && echo >> /var/run/one-context/context.sh.local; test -f /var/run/one-context/context.sh.network && echo >> /var/run/one-context/context.sh.network'"

 # On NIC hotplug the delayed reconfiguration is triggered.