[2416] 2009-07-16 Vladimir Serbinenko <address@hidden>

[Vladimir Serbinenko]

Revision: 2416
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2416
Author:   phcoder
Date:     2009-07-15 22:51:47 +0000 (Wed, 15 Jul 2009)
Log Message:
-----------
2009-07-16  Vladimir Serbinenko  <address@hidden>

        Make FreeBSD accept zpool.cache

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

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/loader/i386/bsd.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-07-15 22:04:41 UTC (rev 2415)
+++ trunk/grub2/ChangeLog       2009-07-15 22:51:47 UTC (rev 2416)
@@ -1,5 +1,12 @@
 2009-07-16  Vladimir Serbinenko  <address@hidden>
 
+       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  <address@hidden>
+
        Fix 64-bit efiemu
 
        * include/grub/efiemu/efiemu.h (grub_efiemu_configuration_table64_t):

Modified: trunk/grub2/loader/i386/bsd.c
===================================================================
--- trunk/grub2/loader/i386/bsd.c       2009-07-15 22:04:41 UTC (rev 2415)
+++ trunk/grub2/loader/i386/bsd.c       2009-07-15 22:51:47 UTC (rev 2416)
@@ -271,6 +271,8 @@
     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))