From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1MZOWk-0000s5-I6 for mharc-grub-devel@gnu.org; Fri, 07 Aug 2009 08:26:30 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MZOWi-0000ob-2U for grub-devel@gnu.org; Fri, 07 Aug 2009 08:26:28 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MZOWc-0000gp-Ph for grub-devel@gnu.org; Fri, 07 Aug 2009 08:26:27 -0400 Received: from [199.232.76.173] (port=49251 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MZOWc-0000gg-K6 for grub-devel@gnu.org; Fri, 07 Aug 2009 08:26:22 -0400 Received: from xvm-190-8.ghst.net ([217.70.190.8]:40178 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 1MZOWc-0005pM-19 for grub-devel@gnu.org; Fri, 07 Aug 2009 08:26:22 -0400 Received: from [192.168.10.10] (helo=thorin) by aybabtu.com with esmtp (Exim 4.69) (envelope-from ) id 1MZOCP-0004uq-VJ for grub-devel@gnu.org; Fri, 07 Aug 2009 14:05:30 +0200 Received: from rmh by thorin with local (Exim 4.69) (envelope-from ) id 1MZOCP-0001ze-8n for grub-devel@gnu.org; Fri, 07 Aug 2009 14:05:29 +0200 Date: Fri, 7 Aug 2009 14:05:29 +0200 From: Robert Millan To: grub-devel@gnu.org Message-ID: <20090807120529.GB7428@thorin> References: <20090804191940.GA14747@thorin> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20090804191940.GA14747@thorin> 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: Re: [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: Fri, 07 Aug 2009 12:26:28 -0000 Committed. Also moved those functions to grub-mkconfig_lib.in. On Tue, Aug 04, 2009 at 09:19:40PM +0200, Robert Millan wrote: > > 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." > 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 > _______________________________________________ > Grub-devel mailing list > Grub-devel@gnu.org > http://lists.gnu.org/mailman/listinfo/grub-devel -- 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."