From 7f26d4665b4746980ae2231d17334e7be6dd3d55 Mon Sep 17 00:00:00 2001 From: robertmh Date: Sat, 5 Sep 2009 20:36:49 +0000 Subject: [PATCH] 2009-09-05 Robert Millan * 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. --- ChangeLog | 6 ++++++ util/grub-probe.c | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index 155a19b5a..262a25076 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-09-05 Robert Millan + + * 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 * gendistlist.sh: Add `grub-dumpdevtree' and `*.lua' to the list diff --git a/util/grub-probe.c b/util/grub-probe.c index 3c54408c3..4e3f96451 100644 --- 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); }