- drop setting color to white as default, use color reset instead

diff --git a/lib/functions b/lib/functions
index fb41ffa17f86c6ee922679bc64e1bf5dd04151cc..8f08dc62283bec1b0699c90d08c63f520d60033b 100644 (file)
--- a/lib/functions
+++ b/lib/functions
@@ -39,7 +39,6 @@ BLUE=4
 MAGENTA=5
 CYAN=6
 WHITE=7
-NORMAL=15
 # Bold definition (second parameter to termput setaf)
 BOLD=1
 NOBOLD=0
@@ -53,7 +52,7 @@ CTLD="$GREEN"         # "TLD Linux" color
 CI="$RED"              # Capital I color (press I to enter interactive startup)
 CRESMAN="$GREEN"       # "Resource Manager" color
 CHARS=""               # Characters displayed on the beginning of show line
-CCHARS="$NORMAL"       # Color of these characters (look at /etc/sysconfig/init-colors.gentoo example)
+CCHARS="$WHITE"                # Color of these characters (look at /etc/sysconfig/init-colors.gentoo example)
 
 # Source configuration if available - may override default values
 [ -r /etc/sysconfig/init-colors ] && . /etc/sysconfig/init-colors
@@ -283,7 +282,7 @@ termput() {
                        is_yes "$COLOR_INIT" && echo -ne "\033[${ISBOLD};3${2}m"
                        ;;
                op)
-                       termput setaf $NORMAL
+                       echo -ne "\033[0m"
                        ;;
                esac
        else
@@ -296,7 +295,7 @@ termput() {
                        is_yes "$COLOR_INIT" && tput setaf "$2"
                        ;;
                op)
-                       termput setaf $NORMAL
+                       tput sgr0
                        ;;
                esac
        fi

diff --git a/sysconfig/init-colors b/sysconfig/init-colors
index 1632fdb43a6be2caeac7d35703636d5d7581396b..8798b96405a9fcd7e16c1ee2ce735061e70b18d3 100644 (file)
--- a/sysconfig/init-colors
+++ b/sysconfig/init-colors
@@ -9,4 +9,4 @@ CTLD="$GREEN"           # "TLD Linux" color
 CI="$RED"              # Capital I color (press I to enter interactive startup)
 CRESMAN="$GREEN"       # "Resource Manager" color
 CHARS=""               # Characters displayed on the beginning of show line
-CCHARS="$NORMAL"       # Color of these characters (look at /usr/share/doc/rc-scripts-*/init-colors.gentoo.gz example)
+CCHARS="$WHITE"                # Color of these characters (look at /usr/share/doc/rc-scripts-*/init-colors.gentoo.gz example)