diff options
author | Tom Gundersen <teg@jklm.no> | 2012-08-27 22:51:40 +0200 |
---|---|---|
committer | Tom Gundersen <teg@jklm.no> | 2012-08-27 22:51:40 +0200 |
commit | c67d598d1cb2c346c83b72449bf20ee5dfea9ae7 (patch) | |
tree | 9894f034f6d8e3c0d61182764754a02bbb4a8abf /functions | |
parent | 41b8e8b66bfeb2a6bb851355ea141d7064eddb10 (diff) | |
parent | b603bf95b18c60fba4d6aa3ad2cb597c197ca6b5 (diff) | |
download | initscripts-c67d598d1cb2c346c83b72449bf20ee5dfea9ae7.tar.xz |
Merge branch 'kill-DAEMON_LOCALE'
Conflicts:
functions
Diffstat (limited to 'functions')
-rw-r--r-- | functions | 22 |
1 files changed, 3 insertions, 19 deletions
@@ -5,11 +5,10 @@ # sanitize PATH (will be overridden later when /etc/profile is sourced but is useful for udev) export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" -localevars=(LANG 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) +# clear the TZ envvar, so daemons always respect /etc/localtime +unset TZ -vconsolevars=(KEYMAP KEYMAP_TOGGLE FONT FONT_MAP FONT_UNIMAP) +. /etc/profile.d/locale.sh if [[ $1 == "start" ]]; then if [[ $STARTING ]]; then @@ -66,12 +65,6 @@ if (( $? != 3 )); then fi unset TERM_COLORS -# clear the TZ envvar, so daemons always respect /etc/localtime -unset TZ - -# sanitize the locale settings -unset "${localevars[@]}" - unquote() { local -r quotes=$'[\'"]' @@ -747,15 +740,6 @@ if (( RC_FUNCTIONS_HOOK_FUNCS_DEFINED != 1 )); then declare -r RC_FUNCTIONS_HOOK_FUNCS_DEFINED=1 fi -if [[ $DAEMON_LOCALE != [nN][oO] ]]; then - export LANG=${LOCALE:-C} - if [[ -r /etc/locale.conf ]]; then - parse_envfile /etc/locale.conf "${localevars[@]}" - fi -else - export LANG=C -fi - # set colors if [[ $USECOLOR != [nN][oO] ]]; then if tput setaf 0 &>/dev/null; then |