diff options
| author | Roy Marples <roy@marples.name> | 2007-07-01 08:45:23 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2007-07-01 08:45:23 +0000 |
| commit | 53097aedc57aafb174e32cbeb8f6527d150e2a66 (patch) | |
| tree | fa02437b36d50b3eba53f8e23ce5e421f5468868 | |
| parent | afaa27fd652fbc3555faa92f3e1e16957bafd751 (diff) | |
Don't set an early font if consolefont isn't in a runlevel, #183773.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | sh.Linux/init-early.sh | 19 |
2 files changed, 15 insertions, 8 deletions
@@ -1,6 +1,10 @@ # ChangeLog for Gentoo System Intialization ("rc") scripts # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPLv2 + 30 Jun 2007; Roy Marples <uberlord@gentoo.org>: + + Don't set an early font if consolefont isn't in a runlevel, #183773. + 27 Jun 2007; Roy Marples <uberlord@gentoo.org>: Add --no-ldconfig option to env-update to match portage. diff --git a/sh.Linux/init-early.sh b/sh.Linux/init-early.sh index 680d63de..3d2e2248 100755 --- a/sh.Linux/init-early.sh +++ b/sh.Linux/init-early.sh @@ -1,12 +1,15 @@ #!/bin/sh # Try and set a font and as early as we can -termencoding="(K" -[ -e "${RC_LIBDIR}"/console/unicode ] && termencoding="%G" -printf "\033%s" "${termencoding}" -if [ -r "${RC_LIBDIR}"/console/font -a -x /bin/setfont ] ; then - font="$(cat "${RC_LIBDIR}"/console/font)" - CONSOLE="${CONSOLE:-/dev/console}" - [ -c "${CONSOLE}" ] && cons="-C ${CONSOLE}" - setfont ${cons} "${RC_LIBDIR}"/console/"${font}" +if [ -e /etc/runlevels/"${RC_DEFAULTLEVEL}"/consolefont \ + -o -e /etc/runlevels/"${RC_BOOTLEVEL}"/consolefont ] ; then + termencoding="(K" + [ -e "${RC_LIBDIR}"/console/unicode ] && termencoding="%G" + printf "\033%s" "${termencoding}" + if [ -r "${RC_LIBDIR}"/console/font -a -x /bin/setfont ] ; then + font="$(cat "${RC_LIBDIR}"/console/font)" + CONSOLE="${CONSOLE:-/dev/console}" + [ -c "${CONSOLE}" ] && cons="-C ${CONSOLE}" + setfont ${cons} "${RC_LIBDIR}"/console/"${font}" + fi fi |