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>
---
 rc.conf | 1 +
 1 file changed, 1 insertion(+)

(limited to 'rc.conf')

diff --git a/rc.conf b/rc.conf
index 303a035..d91dff7 100644
--- a/rc.conf
+++ b/rc.conf
@@ -7,6 +7,7 @@
 # -----------------------------------------------------------------------
 #
 # LOCALE: available languages can be listed with the 'locale -a' command
+#   LANG in /etc/locale.conf takes precedence
 # DAEMON_LOCALE: If set to 'yes', use $LOCALE as the locale during daemon
 # startup and during the boot process. If set to 'no', the C locale is used.
 # HARDWARECLOCK: set to "", "UTC" or "localtime", any other value will result
-- 
cgit v1.2.3