From: Justin Pettit <jpettit@nicira.com>
Date: Tue, 6 Oct 2009 21:33:31 +0000 (-0700)
Subject: Merge commit 'v0.90.6' into citrix
X-Git-Tag: v0.90.7~51
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e7f327ff6bd90bb0ce695ca71054d17829a16888;hp=9e5ce56ddbe26c0fc250ac0b2e030f247689abdc;p=sliver-openvswitch.git

Merge commit 'v0.90.6' into citrix
---

diff --git a/ChangeLog b/ChangeLog
index f2f56a34c..eff97aa5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+v0.90.6 - 6 Oct 2009
+--------------------
+    - Bug fixes
+
 v0.90.5 - 21 Sep 2009
 ---------------------
     - Generalize in-band control to more diverse network setups
diff --git a/configure.ac b/configure.ac
index 41ff7bea8..edfe0f75b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 AC_PREREQ(2.60)
-AC_INIT(openvswitch, 0.90.5, ovs-bugs@openvswitch.org)
+AC_INIT(openvswitch, 0.90.6, ovs-bugs@openvswitch.org)
 NX_BUILDNR
 AC_CONFIG_SRCDIR([datapath/datapath.c])
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/xenserver/README b/xenserver/README
index 276cd6c2a..5407aac9d 100644
--- a/xenserver/README
+++ b/xenserver/README
@@ -50,6 +50,12 @@ files are:
         needed by the controller.  This is called by the "vif" script,
         which is run when virtual interfaces are added and removed.
 
+    root_vswitch_scripts_refresh-xs-network-uuids
+
+        Script to refresh bridge.<bridge>.xs-network-uuids keys, which
+        can get out-of-sync following a pool join.  Running this script
+        is an alternative to rebooting the host.
+
     root_vswitch_scripts_sysconfig.template
 
         Template for vswitch's /etc/sysconfig/vswitch configuration
diff --git a/xenserver/automake.mk b/xenserver/automake.mk
index deb79bc82..4c9c0a979 100644
--- a/xenserver/automake.mk
+++ b/xenserver/automake.mk
@@ -16,6 +16,7 @@ EXTRA_DIST += \
 	xenserver/opt_xensource_libexec_interface-reconfigure \
 	xenserver/root_vswitch_scripts_sysconfig.template \
 	xenserver/root_vswitch_scripts_dump-vif-details \
+	xenserver/root_vswitch_scripts_refresh-xs-network-uuids \
 	xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py \
 	xenserver/usr_sbin_brctl \
 	xenserver/usr_sbin_xen-bugtool \
diff --git a/xenserver/root_vswitch_scripts_refresh-xs-network-uuids b/xenserver/root_vswitch_scripts_refresh-xs-network-uuids
new file mode 100755
index 000000000..34fe1e7e9
--- /dev/null
+++ b/xenserver/root_vswitch_scripts_refresh-xs-network-uuids
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+. /etc/xensource-inventory
+
+for pif in $(xe pif-list --minimal host-uuid=${INSTALLATION_UUID} currently-attached=true VLAN=-1 | sed 's/,/ /g'); do
+    printf "Refreshing PIF %s...  " $pif
+    if /opt/xensource/libexec/interface-reconfigure --pif-uuid=$pif up; then
+        printf "done\n"
+    else
+        printf "error!\n"
+    fi
+done
diff --git a/xenserver/vswitch-xen.spec b/xenserver/vswitch-xen.spec
index b186e2647..01f49f6d2 100644
--- a/xenserver/vswitch-xen.spec
+++ b/xenserver/vswitch-xen.spec
@@ -67,6 +67,8 @@ install -m 755 xenserver/etc_xensource_scripts_vif \
              $RPM_BUILD_ROOT%{_prefix}/scripts/vif
 install -m 755 xenserver/root_vswitch_scripts_dump-vif-details \
                $RPM_BUILD_ROOT%{_prefix}/scripts/dump-vif-details
+install -m 755 xenserver/root_vswitch_scripts_refresh-xs-network-uuids \
+               $RPM_BUILD_ROOT%{_prefix}/scripts/refresh-xs-network-uuids
 install -m 755 xenserver/usr_sbin_xen-bugtool \
              $RPM_BUILD_ROOT%{_prefix}/scripts/xen-bugtool
 install -m 755 xenserver/usr_sbin_brctl \
@@ -329,6 +331,7 @@ fi
 /root/vswitch/kernel_modules/openvswitch_mod.ko
 /root/vswitch/kernel_modules/veth_mod.ko
 /root/vswitch/scripts/dump-vif-details
+/root/vswitch/scripts/refresh-xs-network-uuids
 /root/vswitch/scripts/interface-reconfigure
 /root/vswitch/scripts/vif
 /root/vswitch/scripts/xen-bugtool