Thanks Ashish for the fix. Reviewed-by: Yifeng Sun <[email protected]>
On Fri, Jun 7, 2019 at 3:45 PM Ashish Varma <[email protected]> wrote: > > Fixed a bug where checking for major version 3.10 and major revision not > equal to 327 or 693 or 957 should have gone to the default else at the end. > In the current code, the default else condition will not get executed > for kernel with major version 3.10 and major revision not equal > to 327/693/957 resulting in failure to load the kernel module. > > Signed-off-by: Ashish Varma <[email protected]> > --- > rhel/openvswitch-kmod-fedora.spec.in | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > > diff --git a/rhel/openvswitch-kmod-fedora.spec.in > b/rhel/openvswitch-kmod-fedora.spec.in > index 92d763f..27f443a 100644 > --- a/rhel/openvswitch-kmod-fedora.spec.in > +++ b/rhel/openvswitch-kmod-fedora.spec.in > @@ -90,13 +90,12 @@ if grep -qs "suse" /etc/os-release; then > if [ -x "%{_datadir}/openvswitch/scripts/ovs-kmod-manage.sh" ]; then > %{_datadir}/openvswitch/scripts/ovs-kmod-manage.sh > fi > -elif [ "$mainline_major" = "3" ] && [ "$mainline_minor" = "10" ]; then > - if [ "$major_rev" = "327" ] || [ "$major_rev" = "693" ] || \ > - [ "$major_rev" = "957" ]; then > - # For RHEL 7.2, 7.4 and 7.6 > - if [ -x "%{_datadir}/openvswitch/scripts/ovs-kmod-manage.sh" ]; then > - %{_datadir}/openvswitch/scripts/ovs-kmod-manage.sh > - fi > +elif [ "$mainline_major" = "3" ] && [ "$mainline_minor" = "10" ] && > + { [ "$major_rev" = "327" ] || [ "$major_rev" = "693" ] || \ > + [ "$major_rev" = "957" ]; }; then > + # For RHEL 7.2, 7.4 and 7.6 > + if [ -x "%{_datadir}/openvswitch/scripts/ovs-kmod-manage.sh" ]; then > + %{_datadir}/openvswitch/scripts/ovs-kmod-manage.sh > fi > else > # Ensure that modprobe will find our modules. > -- > 2.7.4 > > _______________________________________________ > dev mailing list > [email protected] > https://mail.openvswitch.org/mailman/listinfo/ovs-dev _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
