[2546] 2009-08-29 Robert Millan <address@hidden>

[Robert Millan]

Revision: 2546
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2546
Author:   robertmh
Date:     2009-08-29 00:34:33 +0000 (Sat, 29 Aug 2009)
Log Message:
-----------
2009-08-29  Robert Millan  <address@hidden>

        * util/grub.d/10_freebsd.in: Detect `ufs1' and `ufs2' and map them
        to `ufs' in the vfs.root.mountfrom kernel parameter.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/util/grub.d/10_freebsd.in

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-08-29 00:24:32 UTC (rev 2545)
+++ trunk/grub2/ChangeLog       2009-08-29 00:34:33 UTC (rev 2546)
@@ -1,5 +1,10 @@
 2009-08-29  Robert Millan  <address@hidden>
 
+       * util/grub.d/10_freebsd.in: Detect `ufs1' and `ufs2' and map them
+       to `ufs' in the vfs.root.mountfrom kernel parameter.
+
+2009-08-29  Robert Millan  <address@hidden>
+
        * term/i386/pc/serial.c: Include `<grub/machine/memory.h>'.
 
        [GRUB_MACHINE_PCBIOS] (serial_hw_io_addr): Macroify initialization

Modified: trunk/grub2/util/grub.d/10_freebsd.in
===================================================================
--- trunk/grub2/util/grub.d/10_freebsd.in       2009-08-29 00:24:32 UTC (rev 
2545)
+++ trunk/grub2/util/grub.d/10_freebsd.in       2009-08-29 00:34:33 UTC (rev 
2546)
@@ -50,8 +50,10 @@
     devices_rel_dirname=`make_system_path_relative_to_its_root 
$devices_dirname`
   fi
 
-  # For "ufs" it's the same.  Do we care about the others?
-  kfreebsd_fs=${GRUB_FS}
+  case ${GRUB_FS} in
+    ufs1 | ufs2)       kfreebsd_fs=ufs ;;
+    *)                 kfreebsd_fs=${GRUB_FS} ;;
+  esac
 
   cat << EOF
 menuentry "${OS}" {