From d088bd27ef9fac2695c9769b4fbb230e32d93b31 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 25 Oct 2011 12:47:26 -0400
Subject: If locale.conf exists, use it. (#706756, in part)

systemd's algorithm on startup is:

- if /etc/locale.conf is parseable, use that
- otherwise, use /etc/sysconfig/i18n

Given that we have a heirarchy of system -> user settings here,
simply go:
 ~/.i18n > /etc/locale.conf > /etc/sysconfig/i18n

Add some documentation as well.
---
 rc.d/init.d/functions | 2 +-
 rc.d/rc               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'rc.d')

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
-- 
cgit v1.2.1