From 2e487803a0ed73930572ae2530e6e80397c29fe9 Mon Sep 17 00:00:00 2001
From: Vlastimil Holer <vholer@opennebula.io>
Date: Thu, 5 Nov 2020 20:54:54 +0100
Subject: [PATCH] B #216: More specific detach NIC workarounds

Closes #216
---
 src/lib/udev/rules.d/65-context.rules##apk.one         | 1 +
 src/lib/udev/rules.d/65-context.rules##deb.one         | 1 +
 src/lib/udev/rules.d/65-context.rules##rpm.systemd.one | 1 +
 src/lib/udev/rules.d/65-context.rules##rpm.sysv.one    | 1 +
 4 files changed, 4 insertions(+)

diff --git a/src/lib/udev/rules.d/65-context.rules##apk.one b/src/lib/udev/rules.d/65-context.rules##apk.one
index 4aae048..198ca7b 100644
--- 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.
diff --git a/src/lib/udev/rules.d/65-context.rules##deb.one b/src/lib/udev/rules.d/65-context.rules##deb.one
index 603f945..c8d00f8 100644
--- 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.
diff --git a/src/lib/udev/rules.d/65-context.rules##rpm.systemd.one b/src/lib/udev/rules.d/65-context.rules##rpm.systemd.one
index 257f13d..0f54e7d 100644
--- 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.
diff --git a/src/lib/udev/rules.d/65-context.rules##rpm.sysv.one b/src/lib/udev/rules.d/65-context.rules##rpm.sysv.one
index b8eeefe..1427701 100644
--- 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.