From fc5bb6b8db61301741ce6345f2378149c777b4b4 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Thu, 1 Sep 2011 13:59:50 +0200 Subject: [PATCH] Added support for /etc/locale.conf with fallback to /etc/sysconfig/i18n for LANG setting --- etc/rc.d/init.d/mountproc | 2 +- etc/rc.d/init.d/rc | 2 +- etc/rc.d/init.d/rc.sysinit | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/rc.d/init.d/mountproc b/etc/rc.d/init.d/mountproc index 36a8d13..9b494a4 100755 --- a/etc/rc.d/init.d/mountproc +++ b/etc/rc.d/init.d/mountproc @@ -6,7 +6,7 @@ . /etc/sysconfig/rc . $rc_functions -. /etc/sysconfig/i18n +[ -e /etc/locale.conf ] && . /etc/locale.conf || . /etc/sysconfig/i18n LC_ALL=$LANG TEXTDOMAIN=initscripts TEXTDOMAINDIR=/usr/share/locale/ diff --git a/etc/rc.d/init.d/rc b/etc/rc.d/init.d/rc index e8c0380..81927ce 100755 --- a/etc/rc.d/init.d/rc +++ b/etc/rc.d/init.d/rc @@ -12,7 +12,7 @@ if [ -r $rc_base/init.d/rc.embedded ]; then fi . $rc_functions -. /etc/sysconfig/i18n +[ -e /etc/locale.conf ] && . /etc/locale.conf || . /etc/sysconfig/i18n LC_ALL=$LANG TEXTDOMAIN=initscripts diff --git a/etc/rc.d/init.d/rc.sysinit b/etc/rc.d/init.d/rc.sysinit index 8c6f08f..1c9b03a 100755 --- a/etc/rc.d/init.d/rc.sysinit +++ b/etc/rc.d/init.d/rc.sysinit @@ -14,7 +14,7 @@ if [ -r $rc_base/init.d/rc.sysinit.embedded ]; then fi . $rc_functions -. /etc/sysconfig/i18n +[ -e /etc/locale.conf ] && . /etc/locale.conf || . /etc/sysconfig/i18n LC_ALL=$LANG TEXTDOMAIN=initscripts TEXTDOMAINDIR=/usr/share/locale/