Fix build error on XenServer

[sliver-openvswitch.git] / xenserver / openvswitch-xen.spec.in

diff --git a/xenserver/openvswitch-xen.spec.in b/xenserver/openvswitch-xen.spec.in
index 572d547..c34c7db 100644 (file)
--- a/xenserver/openvswitch-xen.spec.in
+++ b/xenserver/openvswitch-xen.spec.in
@@ -1,6 +1,6 @@
 # Spec file for Open vSwitch.
 
-# Copyright (C) 2009, 2010, 2011, 2012 Nicira Networks, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012 Nicira, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -41,7 +41,7 @@ Name: openvswitch
 Summary: Open vSwitch daemon/database/utilities
 Group: System Environment/Daemons
 URL: http://www.openvswitch.org/
-Vendor: Nicira Networks, Inc.
+Vendor: Nicira, Inc.
 Version: %{openvswitch_version}
 
 License: ASL 2.0
@@ -125,13 +125,15 @@ rm \
     $RPM_BUILD_ROOT/usr/bin/ovs-benchmark \
     $RPM_BUILD_ROOT/usr/sbin/ovs-bugtool \
     $RPM_BUILD_ROOT/usr/bin/ovs-controller \
+    $RPM_BUILD_ROOT/usr/bin/ovs-l3ping \
     $RPM_BUILD_ROOT/usr/bin/ovs-pki \
     $RPM_BUILD_ROOT/usr/bin/ovs-test \
-    $RPM_BUILD_ROOT/usr/share/man/man8/ovs-test.8 \
     $RPM_BUILD_ROOT/usr/share/man/man1/ovs-benchmark.1 \
     $RPM_BUILD_ROOT/usr/share/man/man8/ovs-bugtool.8 \
     $RPM_BUILD_ROOT/usr/share/man/man8/ovs-controller.8 \
-    $RPM_BUILD_ROOT/usr/share/man/man8/ovs-pki.8
+    $RPM_BUILD_ROOT/usr/share/man/man8/ovs-l3ping.8 \
+    $RPM_BUILD_ROOT/usr/share/man/man8/ovs-pki.8 \
+    $RPM_BUILD_ROOT/usr/share/man/man8/ovs-test.8
 
 install -d -m 755 $RPM_BUILD_ROOT/var/lib/openvswitch
 
@@ -232,11 +234,11 @@ if test ! -e /etc/openvswitch/conf.db; then
     install -d -m 755 -o root -g root /etc/openvswitch
 
     # Create ovs-vswitchd config database
-    ovsdb-tool -vANY:console:off create /etc/openvswitch/conf.db \
+    ovsdb-tool -vconsole:off create /etc/openvswitch/conf.db \
             /usr/share/openvswitch/vswitch.ovsschema
 
     # Create initial table in config database
-    ovsdb-tool -vANY:console:off transact /etc/openvswitch/conf.db \
+    ovsdb-tool -vconsole:off transact /etc/openvswitch/conf.db \
             '[{"op": "insert", "table": "Open_vSwitch", "row": {}}]' \
             > /dev/null
 fi
@@ -291,10 +293,10 @@ done
 # Ensure all required services are set to run
 for s in openvswitch openvswitch-xapi-update; do
     if chkconfig --list $s >/dev/null 2>&1; then
-        chkconfig --del $s || printf "Could not remove $s init script."
+        chkconfig --del $s || printf "Could not remove $s init script.\n"
     fi
-    chkconfig --add $s || printf "Could not add $s init script."
-    chkconfig $s on || printf "Could not enable $s init script."
+    chkconfig --add $s || printf "Could not add $s init script.\n"
+    chkconfig $s on || printf "Could not enable $s init script.\n"
 done
 
 if [ "$1" = "1" ]; then    # $1 = 1 for install
@@ -307,12 +309,8 @@ else    # $1 = 2 for upgrade
         printf "\nThe server is not configured to run Open vSwitch.  To run in\n"
         printf "vswitch mode, you must run the following command:\n\n"
         printf "\txe-switch-network-backend vswitch"
-    else
-        printf "\nTo use the new Open vSwitch install, you should reboot the\n"
-        printf "server now.  Failure to do so may result in incorrect operation."
+        printf "\n\n"
     fi
-
-    printf "\n\n"
 fi
 
 %posttrans %{module_package}
@@ -325,6 +323,15 @@ fi
 # be removed.
 depmod %{xen_version}
 
+mode=$(cat /etc/xensource/network.conf)
+if [ "$mode" = "vswitch" ] || [ "$mode" = "openvswitch" ]; then
+    printf "\nTo use the newly installed Open vSwitch kernel module, you\n"
+    printf "will either have to reboot the hypervisor or follow any\n"
+    printf "workarounds provided by your administration guide. Failure to do\n"
+    printf "so may result in incorrect operation."
+    printf "\n\n"
+fi
+
 %preun
 if [ "$1" = "0" ]; then     # $1 = 0 for uninstall
     # Configure system to use bridge
@@ -402,6 +409,7 @@ exit 0
 /etc/logrotate.d/openvswitch
 /etc/profile.d/openvswitch.sh
 /usr/share/openvswitch/python/
+/usr/share/openvswitch/scripts/ovs-check-dead-ifs
 /usr/share/openvswitch/scripts/ovs-xapi-sync
 /usr/share/openvswitch/scripts/interface-reconfigure
 /usr/share/openvswitch/scripts/InterfaceReconfigure.py