| Message ID | 1562604689-16813-1-git-send-email-ashishvarma.ovs@gmail.com |
|---|---|
| State | Accepted |
| Commit | 4afd1d8769de721a95a4f730fa023f77c9e51895 |
| Headers | show |
| Series | [ovs-dev,v2] rhel: Fixed a bug for checking the correct major version and revision. | expand |
On Mon, Jul 08, 2019 at 09:51:29AM -0700, 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. > > Fixes: 402efbe4e176 ("rhel: Add 4.12 kernel support in ovs-kmod-manage.sh") > Signed-off-by: Ashish Varma <ashishvarma.ovs@gmail.com> > --- > v1-v2: > Added the Fixes tag. I applied this to master. I don't think it needs backporting but please correct me if I am wrong.
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.
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. Fixes: 402efbe4e176 ("rhel: Add 4.12 kernel support in ovs-kmod-manage.sh") Signed-off-by: Ashish Varma <ashishvarma.ovs@gmail.com> --- v1-v2: Added the Fixes tag. --- rhel/openvswitch-kmod-fedora.spec.in | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)