summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorTrey Morris <trey.morris@rackspace.com>2011-06-27 16:48:03 -0500
committerTrey Morris <trey.morris@rackspace.com>2011-06-27 16:48:03 -0500
commit0a2c2e0975c3037372b47b09a7f547eb197ef7d7 (patch)
treea9bf06911ddd8765bb322727dce61c695502dcde /plugins
parente2a734a19584a1d46b85e28e427320b4cd1a840c (diff)
parent8a8c013cd4513b07e936125a23188e7608f40d58 (diff)
downloadnova-0a2c2e0975c3037372b47b09a7f547eb197ef7d7.tar.gz
nova-0a2c2e0975c3037372b47b09a7f547eb197ef7d7.tar.xz
nova-0a2c2e0975c3037372b47b09a7f547eb197ef7d7.zip
trunk merge, getting fierce..
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
-+