From: robertmh <robertmh@localhost>
Date: Fri, 7 Aug 2009 11:55:36 +0000 (+0000)
Subject: 2009-08-07  Robert Millan  <rmh.grub@aybabtu.com>
X-Git-Tag: 1.98~653
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4e2171f866615f25038a506a5986541b025a11f5;p=thirdparty%2Fgrub.git

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

        * util/grub.d/10_freebsd.in: Use an absolute device path for
        `vfs.root.mountfrom'.  Set `vfs.root.mountfrom.options=rw'.
---

diff --git a/ChangeLog b/ChangeLog
index 68134df3e..2632d0509 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-07  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* util/grub.d/10_freebsd.in: Use an absolute device path for
+	`vfs.root.mountfrom'.  Set `vfs.root.mountfrom.options=rw'.
+
 2009-08-06  Felix Zielcke  <fzielcke@z-51.de>
 
 	* util/grub-mkconfig_lib.in (prepare_grub_to_access_device): Fix
diff --git a/util/grub.d/10_freebsd.in b/util/grub.d/10_freebsd.in
index 2addf03a1..64d2cc4c0 100644
--- a/util/grub.d/10_freebsd.in
+++ b/util/grub.d/10_freebsd.in
@@ -50,8 +50,6 @@ if [ "x$kfreebsd" != "x" ] ; then
     devices_rel_dirname=`make_system_path_relative_to_its_root $devices_dirname`
   fi
 
-  root_device=`basename ${GRUB_DEVICE}`
-
   # For "ufs" it's the same.  Do we care about the others?
   kfreebsd_fs=${GRUB_FS}
 
@@ -69,7 +67,8 @@ EOF
 EOF
   fi
   cat << EOF
-	set FreeBSD.vfs.root.mountfrom=${kfreebsd_fs}:${root_device}
+	set FreeBSD.vfs.root.mountfrom=${kfreebsd_fs}:${GRUB_DEVICE}
+	set FreeBSD.vfs.root.mountfrom.options=rw
 }
 EOF
 fi