Attachment 153688 Details for Bug 237839 – proposed fix

[patch] proposed fix

initscripts-avoid-excessive-lang.sh-sourcing.patch (text/plain), 1.37 KB, created by Nils Philippsen on 2007-04-28 07:48:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nils Philippsen

Created: 2007-04-28 07:48:48 UTC

Size: 1.37 KB

patch

obsolete

>Index: rc.d/rc
>===================================================================
>RCS file: /usr/local/CVS/initscripts/rc.d/rc,v
>retrieving revision 1.48
>diff -u -r1.48 rc
>--- rc.d/rc	21 Sep 2006 18:53:11 -0000	1.48
>+++ rc.d/rc	28 Apr 2007 07:38:18 -0000
>@@ -42,6 +42,13 @@
> # 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
>Index: rc.d/init.d/functions
>===================================================================
>RCS file: /usr/local/CVS/initscripts/rc.d/init.d/functions,v
>retrieving revision 1.160
>diff -u -r1.160 functions
>--- rc.d/init.d/functions	26 Oct 2006 20:57:48 -0000	1.160
>+++ rc.d/init.d/functions	28 Apr 2007 07:38:18 -0000
>@@ -18,9 +18,11 @@
> 
> [ -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
> fi
>+# avoid propagating LANGSH_SOURCED any further
>+unset LANGSH_SOURCED
> 
> # Read in our configuration
> if [ -z "${BOOTUP:-}" ]; then

Actions: View | Diff

Attachments on bug 237839: 153688