[2573] 2009-09-05 Robert Millan <[email protected]>

Robert Millan <[email protected]> Sat, 05 Sep 2009 20:36:50 +0000
Newsgroups gmane.comp.boot-loaders.grub.cvs
Message-ID <[email protected]>
Revision: 2573
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2573
Author:   robertmh
Date:     2009-09-05 20:36:49 +0000 (Sat, 05 Sep 2009)
Log Message:
-----------
2009-09-05  Robert Millan  <[email protected]>

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

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/util/grub-probe.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog	2009-09-05 19:26:11 UTC (rev 2572)
+++ trunk/grub2/ChangeLog	2009-09-05 20:36:49 UTC (rev 2573)
@@ -1,3 +1,9 @@
+2009-09-05  Robert Millan  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* gendistlist.sh: Add `grub-dumpdevtree' and `*.lua' to the list

Modified: trunk/grub2/util/grub-probe.c
===================================================================
--- trunk/grub2/util/grub-probe.c	2009-09-05 19:26:11 UTC (rev 2572)
+++ trunk/grub2/util/grub-probe.c	2009-09-05 20:36:49 UTC (rev 2573)
@@ -235,6 +235,9 @@
 
   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 @@
 	  if (memcmp (filebuf_via_grub, filebuf_via_sys, file->size))
 	    grub_util_error ("files differ");
 	}
+#endif
+
       printf ("%s\n", fs->name);
     }