summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorJosh Kearney <josh@jk0.org>2011-06-28 17:05:41 -0500
committerJosh Kearney <josh@jk0.org>2011-06-28 17:05:41 -0500
commitd59e576dfeccdbd7ee82ea2803b57e24dcba2c22 (patch)
treeea8c17a46c7fe9f354e48aa6b9aa754586d13875 /plugins
parentd0ff8a737111e9155fd59816afa5c4fc2b34bb4c (diff)
parent9ae4fbdef0a5f4c925c7e3d546edea06e608e39b (diff)
downloadnova-d59e576dfeccdbd7ee82ea2803b57e24dcba2c22.tar.gz
nova-d59e576dfeccdbd7ee82ea2803b57e24dcba2c22.tar.xz
nova-d59e576dfeccdbd7ee82ea2803b57e24dcba2c22.zip
Merged 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
-+