From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 17 Jun 2012 22:52:30 +0000 (+0000)
Subject: Remove option to disable coloured output.
X-Git-Tag: 004~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=975231128f129c707a9b66f37a538f3f657c00ac;p=network.git

Remove option to disable coloured output.
---

diff --git a/functions b/functions
index 5b592bf0..c5962864 100644
--- a/functions
+++ b/functions
@@ -41,19 +41,3 @@ done
 
 # Reading in global configuration files
 config_read_globals
-
-# Set colour mode
-case "${COLOURS}" in
-	auto)
-		colours_auto_disable
-		;;
-	off|0)
-		colours_disable
-		;;
-	on|1)
-		# Do nothing
-		;;
-	*)
-		warning_log "Unknown parameter given for COLOURS: ${COLOURS}"
-		;;
-esac
diff --git a/functions.constants b/functions.constants
index 6b33e866..ffb788b7 100644
--- a/functions.constants
+++ b/functions.constants
@@ -22,9 +22,6 @@
 # Set gettext text domain.
 TEXTDOMAIN="network"
 
-# Enable colors by default
-COLOURS="auto"
-
 LOG_DIR=/var/log/network
 RUN_DIR=/run/network
 
@@ -38,7 +35,7 @@ NETWORK_HOOKS_DIR=/usr/lib/network/hooks
 
 # Network file configuration.
 NETWORK_CONFIG_FILE=${NETWORK_CONFIG_DIR}/config
-NETWORK_CONFIG_FILE_PARAMS="COLOURS DEBUG"
+NETWORK_CONFIG_FILE_PARAMS="DEBUG"
 CONFIG_HOSTNAME="/etc/hostname"
 
 RED_DB_DIR=${RUN_DIR}/red