* patches/003_grub_probe_segfault.diff: Disable file test codepath, which

    wasn't normally used before.

diff --git a/debian/changelog b/debian/changelog
index cadc6aa04c3012d964d0058780feffab9cd53bcc..0d0626529f3f2dccccfa92a6b5e1a486e20b665b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,10 @@ grub2 (1.97~beta2-2) unstable; urgency=low
 
   [ Robert Millan ]
   * Do not conflict with `grub' dummy package (this prevented upgrades).
+  * patches/003_grub_probe_segfault.diff: Disable file test codepath, which
+    wasn't normally used before.
 
- -- Robert Millan <rmh.debian@aybabtu.com>  Fri, 04 Sep 2009 21:48:39 +0200
+ -- Robert Millan <rmh.debian@aybabtu.com>  Fri, 04 Sep 2009 22:14:04 +0200
 
 grub2 (1.97~beta2-1) unstable; urgency=low
 

diff --git a/debian/patches/003_grub_probe_segfault.diff b/debian/patches/003_grub_probe_segfault.diff
new file mode 100644 (file)
index 0000000..22264fe
--- /dev/null
+++ b/debian/patches/003_grub_probe_segfault.diff
@@ -0,0 +1,23 @@
+Index: util/grub-probe.c
+===================================================================
+--- util/grub-probe.c  (revision 2571)
++++ util/grub-probe.c  (working copy)
+@@ -239,6 +239,9 @@ probe (const char *path, char *device_na
+ 
+       stat (path, &st);
+ 
++      /* FIXME: `path' can't be used to read a file via GRUB facilities,
++         because it's not relative to its root.  */
++#if 0
+       if (S_ISREG (st.st_mode))
+       {
+         /* Regular file.  Verify that we can read it properly.  */
+@@ -258,6 +261,8 @@ probe (const char *path, char *device_na
+         if (memcmp (filebuf_via_grub, filebuf_via_sys, file->size))
+           grub_util_error ("files differ");
+       }
++#endif
++
+       printf ("%s\n", fs->name);
+     }
+