From 4eb9da06994ebc58e4dfe73466e03ac400f98a41 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Sun, 5 Dec 2010 00:38:08 +0100 Subject: locale: set the sysfs value default_utf8 rather than enabling/disabling utf8 in locale.sh This should go some way towards obsoleting /etc/profiled.d/locales.sh (FS#20911). The remaining, and admittedly main, obstacle is proper inheritance of LANG, which Roman is working on. --- rc.sysinit | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'rc.sysinit') diff --git a/rc.sysinit b/rc.sysinit index 589e00d..2f76dad 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -314,10 +314,7 @@ if [[ ${LOCALE,,} =~ utf ]]; then /usr/bin/kbd_mode -u < ${i} printf "\033%%G" > ${i} done - # the $CONSOLE check helps us avoid this when running scripts from cron - cat <<"EOF" >>/etc/profile.d/locale.sh -if [ "$CONSOLE" = "" -a "$TERM" = "linux" -a -t 1 ]; then printf "\033%%G"; fi -EOF + echo 1 > /sys/module/vt/parameters/default_utf8 stat_done [[ $KEYMAP ]] && status "Loading Keyboard Map: $KEYMAP" /bin/loadkeys -q -u "$KEYMAP" else @@ -327,10 +324,7 @@ else /usr/bin/kbd_mode -a < ${i} printf "\033%%@" > ${i} done - # the $CONSOLE check helps us avoid this when running scripts from cron - cat <<"EOF" >>/etc/profile.d/locale.sh -if [ "$CONSOLE" = "" -a "$TERM" = "linux" -a -t 1 ]; then printf "\033%%@"; fi -EOF + echo 0 > /sys/module/vt/parameters/default_utf8 stat_done [[ $KEYMAP ]] && status "Loading Keyboard Map: $KEYMAP" /bin/loadkeys -q $KEYMAP fi -- cgit v1.2.3