From: Ben Pfaff Date: Wed, 7 Oct 2009 17:19:31 +0000 (-0700) Subject: xenserver: Fix ovs-vsctl in built RPM by defining /etc as sysconfdir. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=417a8cb6a6f6f16a7ddf35435079b20f78081bd1;p=openvswitch xenserver: Fix ovs-vsctl in built RPM by defining /etc as sysconfdir. By default, the "configure" script picks a sysconfdir of $prefix/etc, which works out to /usr/etc in our case. That's wrong, of course--it should be /etc--but we didn't notice until now because sysconfdir was only used in ovs-vsctl, which in turn wasn't used at all on a XenServer system until recently. This bug is present on all branches, but it is only potentially visible on "master" and "xs5.7", since only those have ovs-vsctl. It is only actually visible on "xs5.7", since that is the only branch where the system uses ovs-vsctl itself (from /etc/xensource/scripts/vif), but this is being committed to master in case we start using ovs-vsctl there too. Reported-by: Henrik Amren --- diff --git a/xenserver/vswitch-xen.spec b/xenserver/vswitch-xen.spec index bc9271d1..d9a18bd9 100644 --- a/xenserver/vswitch-xen.spec +++ b/xenserver/vswitch-xen.spec @@ -44,7 +44,7 @@ traffic. %setup -q -n openvswitch-%{vswitch_version} %build -./configure --prefix=/usr --localstatedir=%{_localstatedir} --with-l26=/lib/modules/%{xen_version}/build --enable-ssl %{build_number} +./configure --prefix=/usr --sysconfdir=/etc --localstatedir=%{_localstatedir} --with-l26=/lib/modules/%{xen_version}/build --enable-ssl %{build_number} make %{_smp_mflags} %install