diff options
| author | Tom Gundersen <teg@jklm.no> | 2010-12-05 00:38:08 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2010-12-06 11:07:48 +0100 |
| commit | 4eb9da06994ebc58e4dfe73466e03ac400f98a41 (patch) | |
| tree | 253a47644bc5d727c8055e46283dbbc65dd5f3ad /rc.sysinit | |
| parent | 25e2ef0770bc55b0a37ae59f3edf9d90209f100c (diff) | |
| download | initscripts-4eb9da06994ebc58e4dfe73466e03ac400f98a41.tar.xz | |
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.
Diffstat (limited to 'rc.sysinit')
| -rwxr-xr-x | rc.sysinit | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -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 |