Skip to content

Commit

Permalink
Revert "Set default locale"
Browse files Browse the repository at this point in the history
/lkp/lkp/src/stats/stderr:16:in `match': invalid byte sequence in US-ASCII (ArgumentError)

/bin/sh: warning: setlocale: LC_ALL: cannot change locale (Binary file (standard input) matches): No such file or directory

This reverts commit 3f437b1.

CC: Huang Ying <[email protected]>
Signed-off-by: Fengguang Wu <[email protected]>
  • Loading branch information
Fengguang Wu committed May 20, 2015
1 parent 6c76ebe commit 5c60703
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 15 deletions.
8 changes: 0 additions & 8 deletions bin/lkp
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
#!/bin/sh

LOCALE=$(locale -a | grep -i 'C.UTF-\?8\|en_US.UTF-\?8' | head -1)
[ -z "$LOCALE" ] && {
echo 1>&2 "No required locale! Some functionalities may not work properly"
LOCALE=C
}
export LC_ALL=$LOCALE
export LANG=$LOCALE

[ -n "$LKP_SRC" ] ||
export LKP_SRC=$(dirname $(dirname $(readlink -e -v $0)))

Expand Down
9 changes: 2 additions & 7 deletions rootfs/addon/etc/init.d/lkp-bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,8 @@
# Description: LKP bootstrap
### END INIT INFO

LOCALE=$(locale -a | grep -i 'C.UTF-\?8\|en_US.UTF-\?8' | head -1)
[ -z "$LOCALE" ] && {
echo 1>&2 "No required locale! Some functionalities may not work properly"
LOCALE=C
}
export LC_ALL=$LOCALE
export LANG=$LOCALE
# Call this script at boot time.
# Keep it simple and stupid -- it will be installed in a number of rootfs.

mkdir /dev/shm/lkp-bootstrap-once 2>/dev/null || exit 0

Expand Down

0 comments on commit 5c60703

Please sign in to comment.