2009-09-05 Robert Millan <rmh.grub@aybabtu.com>

        * util/grub-probe.c (probe): Comment out buggy codepath, which
        was unexpectedly enabled by Colin Watson's 2009-09-02 fix.  This
        should be re-enabled after 1.97.

diff --git a/ChangeLog b/ChangeLog
index 155a19b5a7d71b13fcd56df85b73636590c31201..262a250761dd88006752f33f8fd8cf7c70df5d29 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-05  Robert Millan  <rmh.grub@aybabtu.com>
+
+       * util/grub-probe.c (probe): Comment out buggy codepath, which
+       was unexpectedly enabled by Colin Watson's 2009-09-02 fix.  This
+       should be re-enabled after 1.97.
+
 2009-09-05  Felix Zielcke  <fzielcke@z-51.de>
 
        * gendistlist.sh: Add `grub-dumpdevtree' and `*.lua' to the list

diff --git a/util/grub-probe.c b/util/grub-probe.c
index 3c54408c3a40e3cbb3270c974ed6c941c04657eb..4e3f96451222cf955afad6c76a8ed90ee2af73ff 100644 (file)
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@@ -235,6 +235,9 @@ probe (const char *path, char *device_name)
 
   if (print == PRINT_FS)
     {
+      /* FIXME: `path' can't be used to read a file via GRUB facilities,
+         because it's not relative to its root.  */
+#if 0
       struct stat st;
 
       stat (path, &st);
@@ -258,6 +261,8 @@ probe (const char *path, char *device_name)
          if (memcmp (filebuf_via_grub, filebuf_via_sys, file->size))
            grub_util_error ("files differ");
        }
+#endif
+
       printf ("%s\n", fs->name);
     }