diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | initscripts.spec | 4 | ||||
| -rwxr-xr-x | rc.d/init.d/functions | 4 | ||||
| -rwxr-xr-x | rc.d/rc | 7 |
4 files changed, 20 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2007-07-17 Nils Philippsen <nphilipp@redhat.com> + * rc.d/rc, rc.d/init.d/functions, initscripts.spec: + avoid calling unicode_start unnecessarily often during startup/shutdown + which causes certain monitor/video card combos to flicker heavily + (#237839) + 2007-05-15 Bill Nottingham <notting@redhat.com> * ChangeLog, initscripts.spec: 8.54-1 diff --git a/initscripts.spec b/initscripts.spec index 8f218eb0..8f21c538 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -203,6 +203,10 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Tue Jul 17 2007 Nils Philippsen <nphilipp@redhat.com> +- avoid calling unicode_start unnecessarily often during startup/shutdown which + causes certain monitor/video card combos to flicker heavily (#237839) + * Tue May 15 2007 Bill Nottingham <notting@redhat.com> 8.54-1 - translation updates: as, bg, cs, ja, ms - redirect bogus errors from cryptsetup to /dev/null <karsten@redhat.com> 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 |