* util/grub.d/10_kfreebsd.in: Allow ufs.ko to be missing as it's

	per default compiled in kernel and prior to 8.0 isn't shipped at all.

diff --git a/ChangeLog b/ChangeLog
index ab5182b8c77b58f7b6bacf1d0e7cf7fa02cd766e..8b593f634e346c8f6896918fe04e611e08dafa0e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-29  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/grub.d/10_kfreebsd.in: Allow ufs.ko to be missing as it's
+       per default compiled in kernel and prior to 8.0 isn't shipped at all.
+
 2011-03-29  Colin Watson  <cjwatson@ubuntu.com>
 
        * grub-core/disk/mdraid1x_linux.c (grub_mdraid_detect): If

diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
index dce5e945cf41c3de8e79f0724bb3d8dc20265141..3600c74f96fcbe81bd5d9498c91bd92f1f84535d 100644 (file)
--- a/util/grub.d/10_kfreebsd.in
+++ b/util/grub.d/10_kfreebsd.in
@@ -110,7 +110,11 @@ EOF
     ;;
   esac
 
-  load_kfreebsd_module ${kfreebsd_fs} false
+  if [ x${kfreebsd_fs} = xufs ]; then
+       load_kfreebsd_module ${kfreebsd_fs} true
+  else
+       load_kfreebsd_module ${kfreebsd_fs} false
+  fi
 
   cat << EOF
        set kFreeBSD.vfs.root.mountfrom=${kfreebsd_fs}:${kfreebsd_device}