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.
---
 lang.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lang.sh')

diff --git a/lang.sh b/lang.sh
index 5be62ad8..9ad5e847 100755
--- a/lang.sh
+++ b/lang.sh
@@ -8,7 +8,7 @@ if [ -n "$LANG" ]; then
     LANG="$saved_lang"
     unset saved_lang
 else
-    for langfile in /etc/sysconfig/i18n "$HOME/.i18n" ; do
+    for langfile in /etc/sysconfig/i18n /etc/locale.conf "$HOME/.i18n" ; do
         [ -f $langfile ] && . $langfile && sourced=1
     done
 fi
-- 
cgit v1.2.1