aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d
diff options
context:
space:
mode:
Diffstat (limited to 'rc.d')
-rw-r--r--rc.d/init.d/functions2
-rwxr-xr-xrc.d/rc2
2 files changed, 2 insertions, 2 deletions
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index e313e35b..1437b252 100644
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -61,7 +61,7 @@ if [ -z "${CONSOLETYPE:-}" ]; then
fi
fi
-if [ -z "${NOLOCALE:-}" ] && [ -z "${LANGSH_SOURCED:-}" ] && [ -f /etc/sysconfig/i18n ] ; then
+if [ -z "${NOLOCALE:-}" ] && [ -z "${LANGSH_SOURCED:-}" ] && [ -f /etc/sysconfig/i18n -o -f /etc/locale.conf ] ; then
. /etc/profile.d/lang.sh 2>/dev/null
# avoid propagating LANGSH_SOURCED any further
unset LANGSH_SOURCED
diff --git a/rc.d/rc b/rc.d/rc
index 678bb5e5..d7b68b69 100755
--- a/rc.d/rc
+++ b/rc.d/rc
@@ -51,7 +51,7 @@ fi
# Set language, vc settings once to avoid doing it for every init script
# through functions
-if [ -z "${NOLOCALE:-}" ] && [ -f /etc/sysconfig/i18n ] ; then
+if [ -z "${NOLOCALE:-}" ] && [ -f /etc/sysconfig/i18n -o -f /etc/locale.conf ] ; then
. /etc/profile.d/lang.sh 2>/dev/null
export LANGSH_SOURCED=1
fi