2010-10-15 Robert Millan <rmh@gnu.org>

	* util/grub.d/10_linux.in (list): Expand "vmlinu[zx]" instances to
	guarantee compressed ones are processed first.

diff --git a/ChangeLog b/ChangeLog
index 5553a991ccf535eeee88ce63294647b29f57187f..a40deb7802678341c38c1a34aeb23271547c6d95 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-15  Robert Millan  <rmh@gnu.org>
+
+       * util/grub.d/10_linux.in (list): Expand "vmlinu[zx]" instances to
+       guarantee compressed ones are processed first.
+
 2010-10-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/efiemu/main.c (grub_efiemu_prepare): Handle errors from

diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 6cb6f0be7c258402f77122fb493790c498016d79..e37bab21b68858e2f91d31033c3abc0ec47c2f4f 100644 (file)
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -102,7 +102,7 @@ EOF
 EOF
 }
 
-list=`for i in /boot/vmlinu[zx]-* /vmlinu[zx]-* ; do
+list=`for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* ; do
         if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
       done`
 prepare_boot_cache=