diff options
| author | Roy Marples <roy@marples.name> | 2009-05-23 20:38:12 +0100 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2009-05-23 20:38:12 +0100 |
| commit | c0fd1b49e49cec28c1f5a3a76f9db11c62e550dc (patch) | |
| tree | fe1f406f976dbcec3d7225ccf1b0f08f6957dfcc /sh/init-early.sh.Linux.in | |
| parent | 5294abe6171610a1aa0eb093774bed9bb965c9cf (diff) | |
Move non compiled libraries from /lib/rc to /libexec/rc
OpenRC version is now stored as plaintext in /libexec/rc/version
Plugins (cursplash, splashutils) will have to be re-compiled to pickup
the new directories. State data needs to be moved from /lib/rc/init.d
to /libexec/rc/init.d as well.
Diffstat (limited to 'sh/init-early.sh.Linux.in')
| -rw-r--r-- | sh/init-early.sh.Linux.in | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sh/init-early.sh.Linux.in b/sh/init-early.sh.Linux.in index a533d52b..e13af131 100644 --- a/sh/init-early.sh.Linux.in +++ b/sh/init-early.sh.Linux.in @@ -3,8 +3,9 @@ # All rights reserved. Released under the 2-clause BSD license. : ${CONSOLE:=/dev/console} +: ${RC_LIBEXECDIR:=@LIBEXECDIR@} -if [ -e "$RC_LIBDIR"/console/unicode ]; then +if [ -e "$RC_LIBEXECDIR"/console/unicode ]; then termencoding="%G" kmode="-u" else @@ -16,10 +17,10 @@ fi if [ -e /etc/runlevels/"$RC_DEFAULTLEVEL"/consolefont \ -o -e /etc/runlevels/"$RC_BOOTLEVEL"/consolefont ]; then printf "\033%s" "$termencoding" >"$CONSOLE" 2>/dev/null - if [ -r "$RC_LIBDIR"/console/font -a -x /bin/setfont ]; then - font="$(cat "$RC_LIBDIR"/console/font)" + if [ -r "$RC_LIBEXECDIR"/console/font -a -x /bin/setfont ]; then + font="$(cat "$RC_LIBEXECDIR"/console/font)" [ -c "$CONSOLE" ] && cons="-C $CONSOLE" - setfont $cons "$RC_LIBDIR"/console/"$font" 2>/dev/null + setfont $cons "$RC_LIBEXECDIR"/console/"$font" 2>/dev/null fi fi @@ -27,8 +28,8 @@ fi if [ -e /etc/runlevels/"$RC_DEFAULTLEVEL"/keymaps \ -o -e /etc/runlevels/"$RC_BOOTLEVEL"/keymaps ]; then kbd_mode $kmode -C "$CONSOLE" 2>/dev/null - if [ -r "$RC_LIBDIR"/console/keymap ]; then - loadkeys "$RC_LIBDIR"/console/keymap 2>/dev/null + if [ -r "$RC_LIBEXECDIR"/console/keymap ]; then + loadkeys "$RC_LIBEXECDIR"/console/keymap 2>/dev/null fi fi |