diff options
author | Judd Vinet <judd@archlinux.org> | 2006-09-28 19:25:16 +0000 |
---|---|---|
committer | Judd Vinet <judd@archlinux.org> | 2006-09-28 19:25:16 +0000 |
commit | 9c34c7c5c8c525ce17a5bf447e40d78741ee15ba (patch) | |
tree | 590657ea7f69ea6b476fd99d34f3b2d60e63b05a /rc.sysinit | |
parent | 00081d09b7ab18b8672a299d61a1281819904890 (diff) | |
download | initscripts-9c34c7c5c8c525ce17a5bf447e40d78741ee15ba.tar.xz |
added CONSOLE check to UTF-8/Locale stuff to avoid doing it when running scripts from cron
Diffstat (limited to 'rc.sysinit')
-rwxr-xr-x | rc.sysinit | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -243,7 +243,8 @@ if [ "`echo $LOCALE | /bin/grep -i utf`" ]; then stat_busy "Setting Consoles to UTF-8" /usr/bin/kbd_mode -u /usr/bin/dumpkeys | /bin/loadkeys --unicode - echo 'if [ "$TERM" = "linux" -a isatty ]; then echo -ne "\e%G"; fi' >>/etc/profile.d/locale.sh + # the $CONSOLE check helps us avoid this when running scripts from cron + echo 'if [ "$CONSOLE" = "" -a "$TERM" = "linux" -a isatty ]; then echo -ne "\e%G"; fi' >>/etc/profile.d/locale.sh stat_done fi @@ -256,7 +257,8 @@ if [ "$CONSOLEFONT" != "" ]; then /usr/bin/setfont $CONSOLEFONT -C /dev/vc/${i} fi done - echo 'if [ "$TERM" = "linux" -a isatty ]; then echo -ne "\e(K"; fi' >>/etc/profile.d/locale.sh + # the $CONSOLE check helps us avoid this when running scripts from cron + echo 'if [ "$CONSOLE" = "" -a "$TERM" = "linux" -a isatty ]; then echo -ne "\e(K"; fi' >>/etc/profile.d/locale.sh stat_done fi # Adding persistent network/cdrom generated rules |