From: Yves Blusseau <blusseau@zetam.org>
Date: Wed, 8 Sep 2010 15:21:32 +0000 (+0200)
Subject:     * util/grub-mkconfig.in: Use new variable.
X-Git-Tag: 1.99~566
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9fe6ea2ead3028b08e166cbe0b4e4f32c914772;p=thirdparty%2Fgrub.git

* util/grub-mkconfig.in: Use new variable.
---

diff --git a/ChangeLog b/ChangeLog
index 8d87e9182..38b97ec8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-08  Yves Blusseau  <blusseau@zetam.org>
+
+        * util/grub-mkconfig.in: Use new variable.
+
 2010-09-08  Yves Blusseau  <blusseau@zetam.org>
 
 	* configure.ac: Define some useful variables.
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 6f1d375a7..c3b4c3398 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -38,6 +38,8 @@ self=`basename $0`
 grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}`
 grub_probe=${sbindir}/`echo grub-probe | sed ${transform}`
 
+GRUB_PREFIX=`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"`
+
 # Usage: usage
 # Print the usage.
 usage () {
@@ -93,18 +95,6 @@ done
 
 . ${libdir}/grub/grub-mkconfig_lib
 
-case "$host_os" in
-netbsd* | openbsd*)
-    # Because /boot is used for the boot block in NetBSD and OpenBSD, use /grub
-    # instead of /boot/grub.
-    GRUB_PREFIX=`echo /grub | sed ${transform}`
-    ;;
-*)
-    # Use /boot/grub by default.
-    GRUB_PREFIX=`echo /boot/grub | sed ${transform}`
-    ;;
-esac
-
 if [ "x$EUID" = "x" ] ; then
   EUID=`id -u`
 fi
@@ -200,7 +190,7 @@ for x in ${GRUB_TERMINAL_OUTPUT}; do
 		exit 1
 	    fi
 	else
-	    for dir in ${pkgdatadir} /boot/grub /usr/share/grub ; do
+	    for dir in ${pkgdatadir} ${GRUB_PREFIX} /usr/share/grub ; do
 		for basename in unicode unifont ascii; do
 		    path="${dir}/${basename}.pf2"
 		    if is_path_readable_by_grub ${path} > /dev/null ; then