Commit fc5bb6b8db61301741ce6345f2378149c777b4b4

Authored by Silvan Calarco
1 parent a77a2db442
Exists in master

Added support for /etc/locale.conf with fallback to /etc/sysconfig/i18n for LANG setting

Showing 3 changed files with 3 additions and 3 deletions Side-by-side Diff

etc/rc.d/init.d/mountproc
... ... @@ -6,7 +6,7 @@
6 6 . /etc/sysconfig/rc
7 7 . $rc_functions
8 8  
9   -. /etc/sysconfig/i18n
  9 +[ -e /etc/locale.conf ] && . /etc/locale.conf || . /etc/sysconfig/i18n
10 10 LC_ALL=$LANG
11 11 TEXTDOMAIN=initscripts
12 12 TEXTDOMAINDIR=/usr/share/locale/
... ... @@ -12,7 +12,7 @@
12 12 fi
13 13  
14 14 . $rc_functions
15   -. /etc/sysconfig/i18n
  15 +[ -e /etc/locale.conf ] && . /etc/locale.conf || . /etc/sysconfig/i18n
16 16  
17 17 LC_ALL=$LANG
18 18 TEXTDOMAIN=initscripts
etc/rc.d/init.d/rc.sysinit
... ... @@ -14,7 +14,7 @@
14 14 fi
15 15  
16 16 . $rc_functions
17   -. /etc/sysconfig/i18n
  17 +[ -e /etc/locale.conf ] && . /etc/locale.conf || . /etc/sysconfig/i18n
18 18 LC_ALL=$LANG
19 19 TEXTDOMAIN=initscripts
20 20 TEXTDOMAINDIR=/usr/share/locale/