diff options
| author | Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> | 2012-02-24 11:18:06 +0100 |
|---|---|---|
| committer | Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> | 2012-02-24 11:18:06 +0100 |
| commit | 274416e82f458ec25033c0547c47b9505c5402ae (patch) | |
| tree | bb4a9ad10d64151e0960443a278070a539e34ae6 /util/grub-mkconfig.in | |
| parent | b3e086225572280d12422b60a841d0a729d940b4 (diff) | |
* grub-core/font/font.c (grub_font_load): Add support for default
path for fonts ($prefix/fonts).
* grub-core/kern/corecmd.c (grub_core_cmd_insmod): Unify condition
for checking if string is a path.
* grub-core/normal/main.c (features): Add feature_default_font_path.
* util/grub-mkconfig.in: Skip mangling of GRUB_FONT into GRUB_FONT_PATH.
* util/grub.d/00_header.in: Use default directory if possible.
* util/grub-install.in: Install unicode.pf2.
Diffstat (limited to 'util/grub-mkconfig.in')
| -rw-r--r-- | util/grub-mkconfig.in | 37 |
1 files changed, 1 insertions, 36 deletions
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in index 9c405053f..198bd37a9 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -157,41 +157,6 @@ if [ "x${GRUB_TERMINAL_OUTPUT}" = "x" ]; then fi for x in ${GRUB_TERMINAL_OUTPUT}; do - if [ "x${x}" = "xgfxterm" ]; then - if [ -n "$GRUB_FONT" ] ; then - if is_path_readable_by_grub ${GRUB_FONT} > /dev/null ; then - GRUB_FONT_PATH=${GRUB_FONT} - else - echo "No such font or not readable by grub: ${GRUB_FONT}" >&2 - exit 1 - fi - else - 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 - GRUB_FONT_PATH=${path} - else - continue - fi - if [ "${basename}" = "ascii" ] ; then - # make sure all our children behave in conformance with ascii.. - export LANG=C - fi - break 2 - done - done - fi - if [ -z "${GRUB_FONT_PATH}" ] ; then - if [ "x$termoutdefault" != "x1" ]; then - gettext "No font for video terminal found." >&2; echo >&2 ; exit 1 - fi - GRUB_TERMINAL_OUTPUT= - fi - fi -done - -for x in ${GRUB_TERMINAL_OUTPUT}; do case "x${x}" in xgfxterm) ;; xconsole | xserial | xofconsole) @@ -208,7 +173,7 @@ export GRUB_DEVICE \ GRUB_DEVICE_BOOT \ GRUB_DEVICE_BOOT_UUID \ GRUB_FS \ - GRUB_FONT_PATH \ + GRUB_FONT \ GRUB_PRELOAD_MODULES \ GRUB_PREFIX |