From 72bd36bdba9fa64933ba7e9db471f5b94f2bcd83 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Tue, 3 May 2011 10:51:06 -0700 Subject: [PATCH] xenserver: Use .../extra not .../kernel/extra for kernel modules. On XenServer, depmod.conf causes modules in /lib/modules/$(uname -r)/extra to take priority over standard modules. Unfortunately, we were installing our modules in /lib/modules/$(uname -r)/kernel/extra, which isn't special. This commit fixes the problem. Signed-off-by: Ben Pfaff Reported-by: Bob Ball --- AUTHORS | 1 + xenserver/openvswitch-xen.spec | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/AUTHORS b/AUTHORS index ea8c5c414..84cb3878c 100644 --- a/AUTHORS +++ b/AUTHORS @@ -41,6 +41,7 @@ provided helpful bug reports or suggestions. Aaron M. Ucko ucko@debian.org Alexey I. Froloff raorn@altlinux.org +Bob Ball bob.ball@citrix.com Brad Hall brad@nicira.com Brandon Heller brandonh@stanford.edu Bryan Fulton bryan@nicira.com diff --git a/xenserver/openvswitch-xen.spec b/xenserver/openvswitch-xen.spec index 7b6ad84df..3ac9d0f68 100644 --- a/xenserver/openvswitch-xen.spec +++ b/xenserver/openvswitch-xen.spec @@ -111,8 +111,8 @@ install -m 644 \ xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py \ $RPM_BUILD_ROOT/usr/lib/xsconsole/plugins-base/XSFeatureVSwitch.py -install -d -m 755 $RPM_BUILD_ROOT/lib/modules/%{xen_version}/kernel/extra/openvswitch -find datapath/linux-2.6 -name *.ko -exec install -m 755 \{\} $RPM_BUILD_ROOT/lib/modules/%{xen_version}/kernel/extra/openvswitch \; +install -d -m 755 $RPM_BUILD_ROOT/lib/modules/%{xen_version}/extra/openvswitch +find datapath/linux-2.6 -name *.ko -exec install -m 755 \{\} $RPM_BUILD_ROOT/lib/modules/%{xen_version}/extra/openvswitch \; install xenserver/uuid.py $RPM_BUILD_ROOT/usr/share/openvswitch/python # Get rid of stuff we don't want to make RPM happy. @@ -386,5 +386,5 @@ fi %exclude /usr/share/openvswitch/python/ovs/db/*.py[co] %files %{module_package} -/lib/modules/%{xen_version}/kernel/extra/openvswitch/openvswitch_mod.ko -%exclude /lib/modules/%{xen_version}/kernel/extra/openvswitch/brcompat_mod.ko +/lib/modules/%{xen_version}/extra/openvswitch/openvswitch_mod.ko +%exclude /lib/modules/%{xen_version}/extra/openvswitch/brcompat_mod.ko -- 2.43.0