json: New function json_to_ds().

[openvswitch] / xenserver / vswitch-xen.spec

diff --git a/xenserver/vswitch-xen.spec b/xenserver/vswitch-xen.spec
index ba78a4db084e5940355bb59a890f0bd91d55cfce..fbac9c55e1722d2ebf492afd527647df6169647e 100644 (file)
--- a/xenserver/vswitch-xen.spec
+++ b/xenserver/vswitch-xen.spec
@@ -1,6 +1,6 @@
 # Spec file for vswitch and related programs.
 
-# Copyright (C) 2009 Nicira Networks, Inc.
+# Copyright (C) 2009, 2010 Nicira Networks, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -105,8 +105,6 @@ rm \
     $RPM_BUILD_ROOT/usr/share/man/man8/ovs-openflowd.8 \
     $RPM_BUILD_ROOT/usr/share/man/man8/ovs-pki.8
 rm -f $RPM_BUILD_ROOT/lib/modules/%{xen_version}/kernel/net/vswitch/veth_mod.ko
-rm -r \
-    $RPM_BUILD_ROOT/usr/share/openvswitch/commands
 
 install -d -m 755 $RPM_BUILD_ROOT/var/lib/openvswitch
 
@@ -190,11 +188,11 @@ fi
 
 if test ! -e /etc/ovs-vswitchd.conf.db; then
     # Create ovs-vswitchd config database
-    ovsdb-tool create /etc/ovs-vswitchd.conf.db \
-            /usr/share/vswitch/vswitch-idl.ovsschema
+    ovsdb-tool -vANY:console:emer create /etc/ovs-vswitchd.conf.db \
+            /usr/share/vswitch/vswitch-idl.ovsschema \
 
     # Create initial table in config database
-    ovsdb-tool transact /etc/ovs-vswitchd.conf.db \
+    ovsdb-tool -vANY:console:emer transact /etc/ovs-vswitchd.conf.db \
             '[{"op": "insert", "table": "Open_vSwitch", "row": {}}]' \
             > /dev/null
 fi