From 448d302143685c3e757ccbe64b6cda5c309edfbe Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Thu, 21 May 2009 13:17:49 -0700 Subject: [PATCH] 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. --- xenserver/etc_xensource_scripts_vif | 4 ++-- xenserver/opt_xensource_libexec_interface-reconfigure | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xenserver/etc_xensource_scripts_vif b/xenserver/etc_xensource_scripts_vif index 2c73768e..fcf13a69 100755 --- 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 7d196ac5..3b99820f 100755 --- 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): -- 2.30.2