xenserver: Fix file name conflict.

Our xenserver scripts were attempting to use /etc/sysconfig/vswitch for
two different purposes: as both a file and a directory.  Move one of them.

diff --git a/xenserver/etc_xensource_scripts_vif b/xenserver/etc_xensource_scripts_vif
index 2c73768eed9a260c382c3186261548ca46c62d04..fcf13a690244673f282e38e3c8d3e6b05b05a52a 100755 (executable)
--- a/xenserver/etc_xensource_scripts_vif
+++ b/xenserver/etc_xensource_scripts_vif
@@ -72,8 +72,8 @@ add_to_bridge()
     logger -t scripts-vif "Adding ${vif} to ${bridge} with address ${address}"
 
     vid=
-    if [ -e "/etc/sysconfig/vswitch/br-$bridge" ]; then
-       . "/etc/sysconfig/vswitch/br-$bridge"
+    if [ -e "/etc/openvswitch/br-$bridge" ]; then
+       . "/etc/openvswitch/br-$bridge"
        if [ -n "$VLAN_SLAVE" -a -n "$VLAN_VID" ]; then
            bridge=$VLAN_SLAVE
            vid="--add=vlan.$vif.tag=$VLAN_VID"

diff --git a/xenserver/opt_xensource_libexec_interface-reconfigure b/xenserver/opt_xensource_libexec_interface-reconfigure
index 7d196ac5ef90c7195be8e0f569d9a675bcadc66b..3b99820ffaa454baff1e534905b6a59a116decc5 100755 (executable)
--- a/xenserver/opt_xensource_libexec_interface-reconfigure
+++ b/xenserver/opt_xensource_libexec_interface-reconfigure
@@ -70,7 +70,7 @@ db = None
 management_pif = None
 
 dbcache_file = "/etc/vswitch.dbcache"
-vswitch_config_dir = "/etc/sysconfig/vswitch"
+vswitch_config_dir = "/etc/openvswitch"
 
 class Usage(Exception):
     def __init__(self, msg):