[2472]

[Robert Millan]

Revision: 2472
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2472
Author:   robertmh
Date:     2009-08-07 12:02:54 +0000 (Fri, 07 Aug 2009)
Log Message:
-----------

Split in two commits.  This one's the first.

2009-08-07  Robert Millan  <address@hidden>

        * util/grub.d/10_linux.in (test_numeric): Moved from here ...
        * util/grub-mkconfig_lib.in (version_test_numeric): ... to here.
        Update all users.

        * util/grub.d/10_linux.in (test_gt): Strip any basename prefix,
        not just "vmlinu[zx]".
        Moved from here ...
        * util/grub-mkconfig_lib.in (version_test_gt): ... to here.  Update
        all users.

        * util/grub.d/10_linux.in (find_latest): Moved from here ...
        * util/grub-mkconfig_lib.in (version_find_latest): ... to here.  Update
        all users.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/util/grub.d/10_linux.in

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-08-07 11:55:36 UTC (rev 2471)
+++ trunk/grub2/ChangeLog       2009-08-07 12:02:54 UTC (rev 2472)
@@ -1,5 +1,21 @@
 2009-08-07  Robert Millan  <address@hidden>
 
+       * util/grub.d/10_linux.in (test_numeric): Moved from here ...
+       * util/grub-mkconfig_lib.in (version_test_numeric): ... to here.
+       Update all users.
+
+       * util/grub.d/10_linux.in (test_gt): Strip any basename prefix,
+       not just "vmlinu[zx]".
+       Moved from here ...
+       * util/grub-mkconfig_lib.in (version_test_gt): ... to here.  Update
+       all users.
+
+       * util/grub.d/10_linux.in (find_latest): Moved from here ...
+       * util/grub-mkconfig_lib.in (version_find_latest): ... to here.  Update
+       all users.
+
+2009-08-07  Robert Millan  <address@hidden>
+
        * util/grub.d/10_freebsd.in: Use an absolute device path for
        `vfs.root.mountfrom'.  Set `vfs.root.mountfrom.options=rw'.
 

Modified: trunk/grub2/util/grub.d/10_linux.in
===================================================================
--- trunk/grub2/util/grub.d/10_linux.in 2009-08-07 11:55:36 UTC (rev 2471)
+++ trunk/grub2/util/grub.d/10_linux.in 2009-08-07 12:02:54 UTC (rev 2472)
@@ -67,8 +67,8 @@
 
 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