Looks good to me. Thanks for fixing this.
On Tue, May 3, 2011 at 10:51 AM, Ben Pfaff <[email protected]> wrote: > 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 <[email protected]> > Reported-by: Bob Ball <[email protected]> > --- > AUTHORS | 1 + > xenserver/openvswitch-xen.spec | 8 ++++---- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/AUTHORS b/AUTHORS > index 38ca142..ba30f50 100644 > --- a/AUTHORS > +++ b/AUTHORS > @@ -44,6 +44,7 @@ Aaron M. Ucko [email protected] > Aaron Rosen [email protected] > Alex Yip [email protected] > Alexey I. Froloff [email protected] > +Bob Ball [email protected] > Brad Hall [email protected] > Brandon Heller [email protected] > Bryan Fulton [email protected] > diff --git a/xenserver/openvswitch-xen.spec b/xenserver/openvswitch-xen.spec > index c428fc6..b7b987e 100644 > --- a/xenserver/openvswitch-xen.spec > +++ b/xenserver/openvswitch-xen.spec > @@ -112,8 +112,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. > @@ -397,5 +397,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 > -- > 1.7.4.4 > > _______________________________________________ > dev mailing list > [email protected] > http://openvswitch.org/mailman/listinfo/dev > _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
