X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=xenserver%2Fetc_xensource_scripts_vif;h=c3baba9e0d0c8eb7614b68642b7034e065f4024a;hb=1d87357a1322c2faa290452c08c7f794c0be848b;hp=796da997139a3e3c13cf91a8c5f647a217bcbf78;hpb=3570ee9844655d02eb365deda907b7c6295788ae;p=openvswitch

diff --git a/xenserver/etc_xensource_scripts_vif b/xenserver/etc_xensource_scripts_vif
index 796da997..c3baba9e 100755
--- a/xenserver/etc_xensource_scripts_vif
+++ b/xenserver/etc_xensource_scripts_vif
@@ -1,8 +1,6 @@
 #!/bin/sh
 
-# This file is based on /etc/xensource/script/vif from Citrix XenServer 5.0.0.
-# The original file did not contain a copyright notice or license statement.
-#
+# Copyright (C) 2008,2009 Citrix Systems, Inc. All rights reserved.
 # Copyright (C) 2009 Nicira Networks, Inc.
 
 # CA-23900: Warning: when VIFs are added to windows guests with PV drivers the backend vif device is registered,
@@ -33,8 +31,8 @@ handle_promiscuous()
     local arg=$(xenstore-read "${PRIVATE}/other-config/promiscuous")
     if [ $? -eq 0 -a -n "${arg}" ] ; then
         case "${arg}" in 
-            true|on) echo 1 > /sys/class/net/${vif}/brport/promisc ;;
-            *) echo 0 > /sys/class/net/${vif}/brport/promisc ;;
+            true|on) logger -t script-vif "${vif}: Promiscuous ports are not supported via vSwitch." ;;
+            *) ;;
         esac
     fi
 }
@@ -97,7 +95,7 @@ add_to_bridge()
         --del-match="vlan.$vif.[!0-9]*" \
         --del-match="port.$vif.[!0-9]*" \
         --add="bridge.$bridge.port=$vif" \
-        $vid $vif_details -c >/tmp/j
+        $vid $vif_details -c 
     $service vswitch reload
 
     ${IP} link set "${vif}" up                          || logger -t scripts-vif "Failed to ip link set ${vif} up"
@@ -128,9 +126,10 @@ remove)
 	xenstore-rm "${HOTPLUG}/hotplug"
 	vif=vif${DOMID}.${DEVID}
 	logger -t scripts-vif "${vif} has been removed"
-        $cfg_mod -vANY:console:emer -F /etc/ovs-vswitchd.conf \
-            --del-match="bridge.*.port=${vif}" \
+	$cfg_mod -vANY:console:emer -F /etc/ovs-vswitchd.conf \
+	    --del-match="bridge.*.port=${vif}" \
 	    --del-match="vlan.${vif}.[!0-9]*" \
 	    --del-match="port.${vif}.[!0-9]*" -c
+	$service vswitch reload
 	;;
 esac