summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorJohannes Erdfelt <johannes.erdfelt@rackspace.com>2011-06-27 15:13:37 +0000
committerJohannes Erdfelt <johannes.erdfelt@rackspace.com>2011-06-27 15:13:37 +0000
commitcbd648c467f299c4f45b720e8c909ff11334f8f0 (patch)
tree55d25eff4f903a8241c0d8bf47610ee01955dff5 /plugins
parent661b318e725d08a4c5cf13a36d4f4603db6f8530 (diff)
parent8a8c013cd4513b07e936125a23188e7608f40d58 (diff)
Merge with trunk
Diffstat (limited to 'plugins')
-rw-r--r--plugins/xenserver/networking/etc/xensource/scripts/vif_5.6-fp1.patch6
1 files changed, 1 insertions, 5 deletions
diff --git a/plugins/xenserver/networking/etc/xensource/scripts/vif_5.6-fp1.patch b/plugins/xenserver/networking/etc/xensource/scripts/vif_5.6-fp1.patch
index feaf1312d..d42a11eff 100644
--- a/plugins/xenserver/networking/etc/xensource/scripts/vif_5.6-fp1.patch
+++ b/plugins/xenserver/networking/etc/xensource/scripts/vif_5.6-fp1.patch
@@ -8,7 +8,7 @@
fi
;;
-@@ -224,9 +225,11 @@
+@@ -224,6 +225,7 @@
remove)
if [ "${TYPE}" = "vif" ] ;then
@@ -16,7 +16,3 @@
xenstore-rm "${HOTPLUG}/hotplug"
fi
logger -t scripts-vif "${dev} has been removed"
- remove_from_bridge
- ;;
- esac
-+