* util/grub-mkconfig_lib.in (is_path_readable_by_grub): Consider a

path unreadable if `grub-probe -t abstraction' fails, for example if
memberlist fails on an LVM volume group.
Reported by: Darius Jahandarie.

diff --git a/ChangeLog b/ChangeLog
index 75c713b9d7022d5dd769cc3b128de1f29f6907a9..062f3c5a8a5ca99f47f81aa8ff7feadf4b51cf51 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-22  Colin Watson  <cjwatson@ubuntu.com>
+
+       * util/grub-mkconfig_lib.in (is_path_readable_by_grub): Consider a
+       path unreadable if `grub-probe -t abstraction' fails, for example if
+       memberlist fails on an LVM volume group.
+       Reported by: Darius Jahandarie.
+
 2011-01-22  Colin Watson  <cjwatson@ubuntu.com>
 
        * docs/grub.texi (Simple configuration): Document

diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index 2a48fb26080ec0452bf71e1ea9b4ce877108f7e2..628ea34d4637a0092bf336614ed6e62a20fbf828 100644 (file)
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -61,6 +61,12 @@ is_path_readable_by_grub ()
     return 1
   fi
 
+  # ... or if we can't figure out the abstraction module, for example if
+  # memberlist fails on an LVM volume group.
+  if ${grub_probe} -t abstraction $path > /dev/null 2>&1 ; then : ; else
+    return 1
+  fi
+
   return 0
 }