[ovs-dev] rhel: Fixed a bug for checking the correct major version and revision.
diff mbox series

Message ID 1559947189-29278-1-git-send-email-ashishvarma.ovs@gmail.com
State New
Headers show
Series
  • [ovs-dev] rhel: Fixed a bug for checking the correct major version and revision.
Related show

Commit Message

Ashish Varma June 7, 2019, 10:39 p.m. UTC
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 <ashishvarma.ovs@gmail.com>
---
 rhel/openvswitch-kmod-fedora.spec.in | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

Comments

Yifeng Sun June 7, 2019, 10:52 p.m. UTC | #1
Thanks Ashish for the fix.

Reviewed-by: Yifeng Sun <pkusunyifeng@gmail.com>

On Fri, Jun 7, 2019 at 3:45 PM Ashish Varma <ashishvarma.ovs@gmail.com> 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 <ashishvarma.ovs@gmail.com>
> ---
>  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
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
Gregory Rose June 7, 2019, 10:54 p.m. UTC | #2
On 6/7/2019 3:39 PM, Ashish Varma 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 <ashishvarma.ovs@gmail.com>
> ---

Should there be a fixes tag?

- Greg

>   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.
Ben Pfaff June 10, 2019, 12:34 a.m. UTC | #3
On Fri, Jun 07, 2019 at 03:54:38PM -0700, Gregory Rose wrote:
> On 6/7/2019 3:39 PM, Ashish Varma 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 <ashishvarma.ovs@gmail.com>
> > ---
> 
> Should there be a fixes tag?

Looks like it.  Ashish, if you'll supply that, I'll commit this.

Thanks,

Ben.

Patch
diff mbox series

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.