emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix early consolefont/termencoding usage vs rc_sys

Browse Source 
During early boot, the keywords were not being checked for
consolefont/termencoding and they were running anyway when they should
not be.

X-Gentoo-Bug: 400549
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=400549
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
This commit is contained in:
Robin H. Johnson 2012-02-09 01:49:04 -08:00
parent 5021c119c7
commit f5e7e76852
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sh/init-early.sh.Linux.in
View File

@ -5,6 +5,19 @@
: ${CONSOLE:=/dev/console} : ${CONSOLE:=/dev/console}
: ${RC_LIBEXECDIR:=@LIBEXECDIR@} : ${RC_LIBEXECDIR:=@LIBEXECDIR@}
service_present()
{
local p="/etc/runlevels/$1/$2"
# fail if the file doesn't exist
[ ! -e "$p" ] && return 1
# succeed if $RC_SYS empty, can't check further, assume script will run
[ -z "$RC_SYS" ] && return 0
# fail if file contains "-$RC_SYS", because then it won't run
egrep -qi "^[[:space:]]*keyword[[:space:]].*-$RC_SYS\>" "$p" && return 1
# succeed otherwise
return 0
}
if [ -e "$RC_LIBEXECDIR"/console/unicode ]; then if [ -e "$RC_LIBEXECDIR"/console/unicode ]; then
termencoding="%G" termencoding="%G"
kmode="-u" kmode="-u"
@ -14,8 +27,8 @@ else
fi fi
# Try and set a font and as early as we can # Try and set a font and as early as we can
if [ -e /etc/runlevels/"$RC_DEFAULTLEVEL"/consolefont \ if service_present "$RC_DEFAULTLEVEL" consolefont ||
-o -e /etc/runlevels/"$RC_BOOTLEVEL"/consolefont ]; then service_present "$RC_BOOTLEVEL" consolefont; then
printf "\033%s" "$termencoding" >"$CONSOLE" 2>/dev/null printf "\033%s" "$termencoding" >"$CONSOLE" 2>/dev/null
if [ -r "$RC_LIBEXECDIR"/console/font -a -x /usr/bin/setfont ]; then if [ -r "$RC_LIBEXECDIR"/console/font -a -x /usr/bin/setfont ]; then
font="$(cat "$RC_LIBEXECDIR"/console/font)" font="$(cat "$RC_LIBEXECDIR"/console/font)"
@ -25,8 +38,8 @@ if [ -e /etc/runlevels/"$RC_DEFAULTLEVEL"/consolefont \
fi fi
# Try and set a keyboard map as early as possible # Try and set a keyboard map as early as possible
if [ -e /etc/runlevels/"$RC_DEFAULTLEVEL"/keymaps \ if service_present "$RC_DEFAULTLEVEL" keymaps ||
-o -e /etc/runlevels/"$RC_BOOTLEVEL"/keymaps ]; then service_present "$RC_BOOTLEVEL" keymaps; then
kbd_mode $kmode -C "$CONSOLE" 2>/dev/null kbd_mode $kmode -C "$CONSOLE" 2>/dev/null
if [ -r "$RC_LIBEXECDIR"/console/keymap ]; then if [ -r "$RC_LIBEXECDIR"/console/keymap ]; then
loadkeys -q "$RC_LIBEXECDIR"/console/keymap 2>/dev/null loadkeys -q "$RC_LIBEXECDIR"/console/keymap 2>/dev/null