* util/grub-mkconfig_lib.in (grub_file_is_not_garbage): Sometimes

grub.d/README accidentally ends up executable for one reason or
another.  Ignore it.

diff --git a/ChangeLog b/ChangeLog
index 3eff5f8847bbb2edf1cd16cc8b13c5f5ff112fbf..57209d1f02aad941f0a89e1fbb8c386079a5f323 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-02  Colin Watson  <cjwatson@ubuntu.com>
+
+       * util/grub-mkconfig_lib.in (grub_file_is_not_garbage): Sometimes
+       grub.d/README accidentally ends up executable for one reason or
+       another.  Ignore it.
+
 2010-07-02  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * partmap/gpt.c (MAX_SECTOR_LOG): New definition.

diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index 14ea1842f60288043d953d627893a5f564d3a9b9..bdd2b8c6f55138a027e1b84f21a8923ce17a38be 100644 (file)
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -128,6 +128,7 @@ grub_file_is_not_garbage ()
   if test -f "$1" ; then
     case "$1" in
       *.dpkg-*) return 1 ;; # debian dpkg
+      README*)  return 1 ;; # documentation
     esac
   else
     return 1