diff options
| author | Ben Pfaff <blp@nicira.com> | 2011-05-03 10:51:06 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2011-05-23 09:18:31 -0700 |
| commit | 33029547d3db19c05b4d010287ae2819f12786b0 (patch) | |
| tree | b2140e40cee6eb9300c355cf3b06f745f6fbcfb5 | |
| parent | 1d226b37ecfb1c1e35787e313abd545a59e22011 (diff) | |
| download | openvswitch-33029547d3db19c05b4d010287ae2819f12786b0.tar.gz | |
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 <blp@nicira.com>
Reported-by: Bob Ball <bob.ball@citrix.com>
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | xenserver/openvswitch-xen.spec | 8 |
2 files changed, 5 insertions, 4 deletions
@@ -44,6 +44,7 @@ Aaron M. Ucko ucko@debian.org Aaron Rosen arosen@clemson.edu Alex Yip alex@nicira.com 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 9e9676316..728bb2c60 100644 --- a/xenserver/openvswitch-xen.spec +++ b/xenserver/openvswitch-xen.spec @@ -114,8 +114,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. @@ -399,5 +399,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 |