2009-11-11 Felix Zielcke <fzielcke@z-51.de>

	* util/grub-probe.c (probe): Abort with an error if file can't be
	opened via GRUB facilities.

diff --git a/ChangeLog.mkrelpath b/ChangeLog.mkrelpath
index 3cd0d8bd28d5d92b6735fb61eb9ccfeaee987007..d24262db5bed45d2aa7277360d565c3a2d993c19 100644 (file)
--- a/ChangeLog.mkrelpath
+++ b/ChangeLog.mkrelpath
@@ -1,3 +1,8 @@
+2009-11-11  Felix Zielcke  <fzielcke@z-51.de>
+
+       * util/grub-probe.c (probe): Abort with an error if file can't be
+       opened via GRUB facilities.
+
 2009-11-11  Felix Zielcke  <fzielcke@z-51.de>
 
        * util/i386/pc/grub-setup.c (setup): Make core.img path relative

diff --git a/util/grub-probe.c b/util/grub-probe.c
index 051a38c72d42ef175f6fd6000959dcbbad772068..1594d0dcbe662a00f4f1a77986fce253bcc062f3 100644 (file)
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@@ -253,6 +253,8 @@ probe (const char *path, char *device_name)
          free (rel_path);
          grub_util_info ("reading %s via GRUB facilities", grub_path);
          file = grub_file_open (grub_path);
+         if (! file)
+           grub_util_error ("can not open %s via GRUB facilities", grub_path);
          filebuf_via_grub = xmalloc (file->size);
          grub_file_read (file, filebuf_via_grub, file->size);