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 bbcfb05302e6edaa45c71d58ffe766bcb7e81169..e865912f25c0e3f718481a2c1c501581c7076333 100644 (file)
--- 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 ed4029a61ba9e8f365a9491cde4c9202b04a4a90..036a676609d75bcd3da4d898e2cff32de8dda657 100644 (file)
--- 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"