From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1MYPYx-00065H-An for mharc-grub-devel@gnu.org; Tue, 04 Aug 2009 15:20:43 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MYPYv-00064v-PH for grub-devel@gnu.org; Tue, 04 Aug 2009 15:20:41 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MYPYr-00063l-Ar for grub-devel@gnu.org; Tue, 04 Aug 2009 15:20:41 -0400 Received: from [199.232.76.173] (port=41059 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MYPYq-00063e-CI for grub-devel@gnu.org; Tue, 04 Aug 2009 15:20:36 -0400 Received: from xvm-190-8.ghst.net ([217.70.190.8]:41393 helo=aybabtu.com) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MYPYp-00035Z-Pq for grub-devel@gnu.org; Tue, 04 Aug 2009 15:20:36 -0400 Received: from [192.168.10.10] (helo=thorin) by aybabtu.com with esmtp (Exim 4.69) (envelope-from ) id 1MYPYl-0004BU-NL for grub-devel@gnu.org; Tue, 04 Aug 2009 21:20:34 +0200 Received: from rmh by thorin with local (Exim 4.69) (envelope-from ) id 1MYPXw-0003py-EW for grub-devel@gnu.org; Tue, 04 Aug 2009 21:19:40 +0200 Date: Tue, 4 Aug 2009 21:19:40 +0200 From: Robert Millan To: grub-devel@gnu.org Message-ID: <20090804191940.GA14747@thorin> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="BXVAT5kNtrzKuDFl" Content-Disposition: inline Organization: free as in freedom X-Message-Flag: Worried about Outlook viruses? Switch to Thunderbird! www.mozilla.com/thunderbird X-Debbugs-No-Ack: true User-Agent: Mutt/1.5.18 (2008-05-17) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: [PATCH] make 10_linux' test_gt() a bit more generic X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Aug 2009 19:20:42 -0000 --BXVAT5kNtrzKuDFl Content-Type: text/plain; charset=us-ascii Content-Disposition: inline This makes 10_linux' test_gt() a bit more generic so that it can be moved (along with a few other functions) to grub-mkconfig_lib, where it'll be usable by 10_freebsd. This will allow handling multiple kernel versions in 10_freebsd, like 10_linux does. -- Robert Millan The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and how) you may access your data; but nobody's threatening your freedom: we still allow you to remove your data and not access it at all." --BXVAT5kNtrzKuDFl Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="test_gt.diff" 2009-08-04 Robert Millan * util/grub.d/10_linux.in (test_gt): Strip any basename prefix, not just "vmlinu[zx]". Index: util/grub.d/10_linux.in =================================================================== --- util/grub.d/10_linux.in (revision 2466) +++ util/grub.d/10_linux.in (working copy) @@ -67,8 +67,8 @@ test_numeric () test_gt () { - local a=`echo $1 | sed -e "s/vmlinu[zx]-//g"` - local b=`echo $2 | sed -e "s/vmlinu[zx]-//g"` + local a=`echo $1 | sed -e "s/[^-]*-//g"` + local b=`echo $2 | sed -e "s/[^-]*-//g"` local cmp=gt if [ "x$b" = "x" ] ; then return 0 --BXVAT5kNtrzKuDFl--