From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-4174-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 25088 invoked by alias); 9 Jun 2011 19:48:27 -0000
Received: (qmail 25068 invoked by uid 9664); 9 Jun 2011 19:48:26 -0000
Date: Thu, 09 Jun 2011 19:48:00 -0000
Message-ID: <20110609194826.25066.qmail@sourceware.org>
From: mbroz@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/test/lib utils.sh
Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <lvm2-cvs.sourceware.org>
List-Subscribe: <mailto:lvm2-cvs-subscribe@sourceware.org>
List-Post: <mailto:lvm2-cvs@sourceware.org>
List-Help: <mailto:lvm2-cvs-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: lvm2-cvs-owner@sourceware.org
X-SW-Source: 2011-06/txt/msg00021.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mbroz@sourceware.org	2011-06-09 19:48:26

Modified files:
	test/lib       : utils.sh 

Log message:
	Fix kernel version test (RHEL: 2.6.32-123).

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/lib/utils.sh.diff?cvsroot=lvm2&r1=1.5&r2=1.6

--- LVM2/test/lib/utils.sh	2011/06/09 18:58:01	1.5
+++ LVM2/test/lib/utils.sh	2011/06/09 19:48:26	1.6
@@ -162,8 +162,8 @@
     test $minor -lt $2 && return 1
     test -z "$3" && return 0
 
-    minor2=$(uname -r | cut -d. -f3)
-    test -z "$minor2" && return 0
+    minor2=$(uname -r | cut -d. -f3 | cut -d- -f1)
+    test -z "$minor2" -a $3 -ne 0 && return 1
     test $minor2 -ge $3 2>/dev/null && return 0
 
     return 1