2009-07-16 Vladimir Serbinenko <phcoder@gmail.com>

	Make FreeBSD accept zpool.cache

	* loader/i386/bsd.c (grub_freebsd_add_meta_module): spoof filename if
	type is /boot/zfs/zpool.cache

diff --git a/ChangeLog b/ChangeLog
index 9d5e2f6cdea53f478f86d46a7cf4f95b4c037455..80bd3a68a2d000ea550569a87dea127881f6b614 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-07-16  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Make FreeBSD accept zpool.cache
+
+       * loader/i386/bsd.c (grub_freebsd_add_meta_module): spoof filename if
+       type is /boot/zfs/zpool.cache
+
 2009-07-16  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Fix 64-bit efiemu

diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index b76cfb549c501f0a18d25d7d03f00aebfa681f8e..468e6d0cf795b0033b909ae293d5b6356fbd83ed 100644 (file)
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -271,6 +271,8 @@ grub_freebsd_add_meta_module (char *filename, char *type, int argc, char **argv,
     name++;
   else
     name = filename;
+  if (grub_strcmp (type, "/boot/zfs/zpool.cache") == 0)
+    name = "/boot/zfs/zpool.cache";
 
   if (grub_freebsd_add_meta (FREEBSD_MODINFO_NAME, name,
                             grub_strlen (name) + 1))