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

2009-08-07  Robert Millan  <rmh.grub@aybabtu.com>

        * 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.

diff --git a/ChangeLog b/ChangeLog
index 2632d050989eb4efe1445e93fe6dd544e10c7380..78a212ff11cf0ef2cb07f3a86a3707e524ef54cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2009-08-07  Robert Millan  <rmh.grub@aybabtu.com>
+
+       * 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  <rmh.grub@aybabtu.com>
 
        * util/grub.d/10_freebsd.in: Use an absolute device path for

diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 3d130609aa5efef86e431a0fc2d4e3f0f2da79cd..637bf3e9420fa775bb4a9bf726714333a32b45d5 100644 (file)
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -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