diff options
author | Nils Philippsen <nphilipp@redhat.com> | 2007-07-17 15:14:37 +0000 |
---|---|---|
committer | Nils Philippsen <nphilipp@redhat.com> | 2007-07-17 15:14:37 +0000 |
commit | 936f71ddbcdab97583d72235011bedfc3b8b132e (patch) | |
tree | f501d0fff6b0a2dd13cf85d145496c58a2e3d72d /rc.d | |
parent | a4b6b441d047fb33f39569d26a63b44f1a04b119 (diff) | |
download | initscripts-936f71ddbcdab97583d72235011bedfc3b8b132e.tar initscripts-936f71ddbcdab97583d72235011bedfc3b8b132e.tar.gz initscripts-936f71ddbcdab97583d72235011bedfc3b8b132e.tar.bz2 initscripts-936f71ddbcdab97583d72235011bedfc3b8b132e.tar.xz initscripts-936f71ddbcdab97583d72235011bedfc3b8b132e.zip |
avoid calling unicode_start unnecessarily often during startup/shutdown which causes certain monitor/video card combos to flicker heavily (#237839)
Diffstat (limited to 'rc.d')
-rwxr-xr-x | rc.d/init.d/functions | 4 | ||||
-rwxr-xr-x | rc.d/rc | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index 580216d1..25b9d1e2 100755 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -18,8 +18,10 @@ export PATH [ -z "${CONSOLETYPE:-}" ] && CONSOLETYPE="`/sbin/consoletype`" -if [ -f /etc/sysconfig/i18n -a -z "${NOLOCALE:-}" ] ; then +if [ -f /etc/sysconfig/i18n -a -z "${NOLOCALE:-}" -a -z "${LANGSH_SOURCED:-}" ] ; then . /etc/profile.d/lang.sh + # avoid propagating LANGSH_SOURCED any further + unset LANGSH_SOURCED fi # Read in our configuration @@ -42,6 +42,13 @@ fi # Is there an rc directory for this new runlevel? [ -d /etc/rc$runlevel.d ] || exit 0 +# Set language, vc settings once to avoid doing it for every init script +# through functions +if [ -f /etc/sysconfig/i18n -a -z "${NOLOCALE:-}" ] ; then + . /etc/profile.d/lang.sh + export LANGSH_SOURCED=1 +fi + # First, run the KILL scripts. for i in /etc/rc$runlevel.d/K* ; do check_runlevel "$i" || continue |