From 137a7347ff975e4988d7fd999a0a6c32fee0464b Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg@jklm.no>
Date: Mon, 17 Oct 2011 20:55:38 +0200
Subject: locale.sh: support /etc/locale.conf

This is mainly to support non-bash shells that cannot source rc.conf.

The format of /etc/locale.conf is described here:
<http://0pointer.de/public/systemd-man/locale.conf.html>.

If LANG is not set in locale.conf, then we fall back to LOCALE
from rc.conf, as before.

Signed-off-by: Tom Gundersen <teg@jklm.no>
---
 functions | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'functions')

diff --git a/functions b/functions
index 2ea81f9..68f4229 100644
--- a/functions
+++ b/functions
@@ -67,8 +67,12 @@ unset TZ
 unset LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY \
       LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE \
       LC_MEASUREMENT LC_IDENTIFICATION LC_ALL
-if [[ $DAEMON_LOCALE = [yY][eE][sS] && $LOCALE ]]; then
-	export LANG="${LOCALE}"
+if [[ $DAEMON_LOCALE = [yY][eE][sS] ]]; then
+	if [ -r /etc/locale.conf ]; then
+		. /etc/locale.conf
+	else
+		export LANG="${LOCALE}"
+	fi
 else
 	export LANG=C
 fi
-- 
cgit v1.2.3