2009-08-29 Robert Millan <rmh.grub@aybabtu.com>

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

diff --git a/ChangeLog b/ChangeLog
index 66b8371dd5503ddeee5e84528fd86e22868a59a6..0f4ca8fbdd5ec1db590f622dab30cbbfa562c947 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-29  Robert Millan  <rmh.grub@aybabtu.com>
+
+       * 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  <rmh.grub@aybabtu.com>
 
        * term/i386/pc/serial.c: Include `<grub/machine/memory.h>'.

diff --git a/util/grub.d/10_freebsd.in b/util/grub.d/10_freebsd.in
index 64d2cc4c020ef3d090855620cc5393c8eeb35301..1e3a0de1f2bc8fbb7230709d55ee3c628cda40d8 100644 (file)
--- a/util/grub.d/10_freebsd.in
+++ b/util/grub.d/10_freebsd.in
@@ -50,8 +50,10 @@ if [ "x$kfreebsd" != "x" ] ; then
     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}" {