From c90edae43aba3a15010b8502f403cc6bc9106504 Mon Sep 17 00:00:00 2001
From: robertmh <robertmh@localhost>
Date: Sat, 29 Aug 2009 00:34:33 +0000
Subject: [PATCH] 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.
---
 ChangeLog                 | 5 +++++
 util/grub.d/10_freebsd.in | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 66b8371dd..0f4ca8fbd 100644
--- 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 64d2cc4c0..1e3a0de1f 100644
--- 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}" {