Fix references to vswitch-idl.ovsschema to refer to vswitch.ovsschema.

diff --git a/debian/openvswitch-common.install b/debian/openvswitch-common.install
index c46d9be3cf7c1f20f43293a8081307ace98a525c..fab9916666965e950e840aac07f5ddfdb9a94490 100644 (file)
--- a/debian/openvswitch-common.install
+++ b/debian/openvswitch-common.install
@@ -4,4 +4,4 @@ _debian/utilities/ovs-appctl usr/sbin
 _debian/utilities/ovs-ofctl usr/sbin
 _debian/utilities/ovs-parse-leaks usr/bin
 _debian/utilities/ovs-pki usr/sbin
-vswitchd/vswitch-idl.ovsschema usr/share/openvswitch
+vswitchd/vswitch.ovsschema usr/share/openvswitch

diff --git a/debian/openvswitch-switch.init b/debian/openvswitch-switch.init
index 1f65b693db0e5d5160658fc87aaee155c3ced891..3a7f2924406dfeba0b887e909f53fb8cd18fe19b 100755 (executable)
--- a/debian/openvswitch-switch.init
+++ b/debian/openvswitch-switch.init
@@ -209,7 +209,7 @@ case "$1" in
             # Create configuration database.
             ovsdb-tool -vANY:console:emer \
                 create /etc/openvswitch-switch/conf \
-                /usr/share/openvswitch/vswitch-idl.ovsschema
+                /usr/share/openvswitch/vswitch.ovsschema
         fi
 
         if test "$ENABLE_MONITOR" = y; then

diff --git a/xenserver/etc_init.d_vswitch b/xenserver/etc_init.d_vswitch
index eb5dcb32a518aebda2ee3f5a92982d46a9e0464d..7bc826aa52fe650c5e38a7bb2d97dd4c1ff586e9 100755 (executable)
--- a/xenserver/etc_init.d_vswitch
+++ b/xenserver/etc_init.d_vswitch
@@ -46,7 +46,7 @@ test -e /etc/sysconfig/vswitch && . /etc/sysconfig/vswitch
 
 # Config variables specific to ovs-vswitchd
 : ${VSWITCHD_OVSDB_SERVER:=unix:/var/run/ovsdb-server}
-: ${VSWITCHD_OVSDB_SCHEMA:=/usr/share/vswitch/vswitch-idl.ovsschema}
+: ${VSWITCHD_OVSDB_SCHEMA:=/usr/share/vswitch/vswitch.ovsschema}
 : ${VSWITCHD_PIDFILE:=/var/run/ovs-vswitchd.pid}
 : ${VSWITCHD_RUN_DIR:=/var/xen/vswitch}
 : ${VSWITCHD_PRIORITY:=-10}

diff --git a/xenserver/usr_share_vswitch_scripts_sysconfig.template b/xenserver/usr_share_vswitch_scripts_sysconfig.template
index b9d7ecb240af959509a7b60614e3c48b6fbe749c..8b740c2e27530ddb30afba19cc90c9dba74a732f 100644 (file)
--- a/xenserver/usr_share_vswitch_scripts_sysconfig.template
+++ b/xenserver/usr_share_vswitch_scripts_sysconfig.template
@@ -103,7 +103,7 @@
 
 # VSWITCHD_OVSDB_SCHEMA: Schema file to use for generating a new OVSDB
 #     ovs-vswitchd database.
-# VSWITCHD_OVSDB_SCHEMA=/usr/share/vswitch/vswitch-idl.ovsschema
+# VSWITCHD_OVSDB_SCHEMA=/usr/share/vswitch/vswitch.ovsschema
 
 # VSWITCHD_PIDFILE: File in which to store the pid of the running
 #     ovs-vswitchd.

diff --git a/xenserver/vswitch-xen.spec b/xenserver/vswitch-xen.spec
index fbac9c55e1722d2ebf492afd527647df6169647e..a409892dabe879c1aeaa446b3bf4087f6e560c56 100644 (file)
--- a/xenserver/vswitch-xen.spec
+++ b/xenserver/vswitch-xen.spec
@@ -67,8 +67,8 @@ install -d -m 755 $RPM_BUILD_ROOT/etc/xapi.d/plugins
 install -m 755 xenserver/etc_xapi.d_plugins_vswitch-cfg-update \
          $RPM_BUILD_ROOT/etc/xapi.d/plugins/vswitch-cfg-update
 install -d -m 755 $RPM_BUILD_ROOT/usr/share/vswitch/scripts
-install -m 644 vswitchd/vswitch-idl.ovsschema \
-         $RPM_BUILD_ROOT/usr/share/vswitch/vswitch-idl.ovsschema
+install -m 644 vswitchd/vswitch.ovsschema \
+         $RPM_BUILD_ROOT/usr/share/vswitch/vswitch.ovsschema
 install -m 755 xenserver/opt_xensource_libexec_interface-reconfigure \
              $RPM_BUILD_ROOT/usr/share/vswitch/scripts/interface-reconfigure
 install -m 755 xenserver/etc_xensource_scripts_vif \
@@ -189,7 +189,7 @@ fi
 if test ! -e /etc/ovs-vswitchd.conf.db; then
     # Create ovs-vswitchd config database
     ovsdb-tool -vANY:console:emer create /etc/ovs-vswitchd.conf.db \
-            /usr/share/vswitch/vswitch-idl.ovsschema \
+            /usr/share/vswitch/vswitch.ovsschema \
 
     # Create initial table in config database
     ovsdb-tool -vANY:console:emer transact /etc/ovs-vswitchd.conf.db \
@@ -331,7 +331,7 @@ fi
 # include them.
 /usr/share/vswitch/scripts/XSFeatureVSwitch.pyc
 /usr/share/vswitch/scripts/XSFeatureVSwitch.pyo
-/usr/share/vswitch/vswitch-idl.ovsschema
+/usr/share/vswitch/vswitch.ovsschema
 /usr/sbin/ovs-brcompatd
 /usr/sbin/ovs-vswitchd
 /usr/sbin/ovsdb-server