From: robertmh <robertmh@localhost>
Date: Sun, 29 Jun 2008 14:29:48 +0000 (+0000)
Subject: 2008-06-29  Robert Millan  <rmh@aybabtu.com>
X-Git-Tag: 1.98~1458
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=674835c8301e7825f040e07843374474a52ad5ec;p=thirdparty%2Fgrub.git

2008-06-29  Robert Millan  <rmh@aybabtu.com>

        * util/update-grub_lib.in (font_path): Search for fonts in
        /boot/grub first, which is more likely to be readable (we aren't
        deciding where fonts live, just looking for them).
---

diff --git a/ChangeLog b/ChangeLog
index bbcfb0530..e865912f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-29  Robert Millan  <rmh@aybabtu.com>
+
+	* util/update-grub_lib.in (font_path): Search for fonts in
+	/boot/grub first, which is more likely to be readable (we aren't
+	deciding where fonts live, just looking for them).
+
 2008-06-26  Pavel Roskin  <proski@gnu.org>
 
 	* util/biosdisk.c (read_device_map): Don't leave dead map
diff --git a/util/update-grub_lib.in b/util/update-grub_lib.in
index ed4029a61..036a67660 100644
--- a/util/update-grub_lib.in
+++ b/util/update-grub_lib.in
@@ -130,9 +130,7 @@ prepare_grub_to_access_device ()
 
 font_path ()
 {
-  # Prefer system path for space reasons (/boot/grub might be a very small
-  # partition in case of OpenFirmware, etc).
-  for dir in ${pkgdatadir} /usr/share/grub /boot/grub ; do
+  for dir in ${pkgdatadir} /boot/grub /usr/share/grub ; do
     # Prefer complete fonts over incomplete ones.
     for basename in unicode unifont ascii ; do
       path="${dir}/${basename}.pff"