2009-07-05 Pavel Roskin <proski@gnu.org>

	* util/grub.d/10_freebsd.in: Fix spelling of `device.hints' on
	FreeBSD.
	* util/osdetect.lua: Likewise.

diff --git a/ChangeLog b/ChangeLog
index d081eccd02a9cb30d8061c44fbc223cb96566416..e72f8cd318c252c7e8efe90ea4ca0a0543192b21 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-05  Pavel Roskin  <proski@gnu.org>
+
+       * util/grub.d/10_freebsd.in: Fix spelling of `device.hints' on
+       FreeBSD.
+       * util/osdetect.lua: Likewise.
+
 2009-07-05  Bean  <bean123ch@gmail.com>
 
        * conf/common.rmk (lua_mode_SOURCES): Add script/lua/lstrlib.c.

diff --git a/util/grub.d/10_freebsd.in b/util/grub.d/10_freebsd.in
index 11e3a25c4a1708cf02f6864c3cc0ac886d7caa85..2addf03a1542655759357d7f387cffb44c7b87e2 100644 (file)
--- a/util/grub.d/10_freebsd.in
+++ b/util/grub.d/10_freebsd.in
@@ -26,8 +26,8 @@ case "${GRUB_DISTRIBUTOR}" in
   *)           OS="FreeBSD" ;;
 esac
 
-if test -e /boot/devices.hints ; then
-  devices=/boot/devices.hints
+if test -e /boot/device.hints ; then
+  devices=/boot/device.hints
 fi
 
 if test -e /boot/kernel/kernel ; then

diff --git a/util/osdetect.lua b/util/osdetect.lua
index c57d612245e765bd5dc4c65b556d38d43e57862e..38a90993dacf1b479c950d1c3f0d3a83dbe2a83f 100644 (file)
--- a/util/osdetect.lua
+++ b/util/osdetect.lua
@@ -59,7 +59,7 @@ function enum_device (device, fs, uuid)
   elseif (grub.file_exist (root .. "kernel.sys")) then
     title = "FreeDOS"
   elseif (grub.file_exist (root .. "boot/loader") and
-         grub.file_exist (root .. "boot/devices.hints")) then
+         grub.file_exist (root .. "boot/device.hints")) then
     source = "root (" .. device .. ")\nfreebsd /boot/loader" ..
       "\nfreebsd_loadenv /boot/device.hints"
     title = "FreeBSD"