From 9c34c7c5c8c525ce17a5bf447e40d78741ee15ba Mon Sep 17 00:00:00 2001 From: Judd Vinet Date: Thu, 28 Sep 2006 19:25:16 +0000 Subject: added CONSOLE check to UTF-8/Locale stuff to avoid doing it when running scripts from cron --- rc.sysinit | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rc.sysinit b/rc.sysinit index ed80105..e392e87 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -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 -- cgit v1.2.3