Revert "Allow FANCYTTY to be sourced from /etc/default/rcS."

This reverts commit ce9dcceef7745798cf92b2aac03164818b79ce63.

This avoids one ugly `set +u` in the $() subshell and avoids the hijack of /etc/default/rcS.

Reopens: #673207

Closes: #675162
Reported-by: Kamen Naydenov <pau4o@kamennn.eu>
Closes: #675197
Reported-by: Steve Cotton <steve@s.cotton.clara.co.uk>
Thanks-To: Julien Cristau <jcristau@debian.org>

diff --git a/debian/lsb-base.NEWS b/debian/lsb-base.NEWS
index 40c30feba7ce1a596202188640f6ac16274a2ee6..476ddc600987894508c0e9d68cb03aaaf48915eb 100644 (file)
--- a/debian/lsb-base.NEWS
+++ b/debian/lsb-base.NEWS
@@ -12,6 +12,6 @@ lsb (4.1+Debian1) unstable; urgency=low
   or a red [FAIL] depending on the daemon exit status.
 
   The "Fancy output" can be disabled by setting the FANCYTTY variable to 0
-  in the /etc/default/rcS configuration file.
+  in the /etc/lsb-base-logging.sh configuration file.
 
  -- Didier Raboud <odyx@debian.org>  Thu, 19 Apr 2012 11:25:01 +0200

diff --git a/debian/lsb-base.README.Debian b/debian/lsb-base.README.Debian
index 2a3637ce34238a76f7a995114ef1dbf990915469..3f86d935ea1b756f8aa55036574e0e70008712e3 100644 (file)
--- a/debian/lsb-base.README.Debian
+++ b/debian/lsb-base.README.Debian
@@ -193,7 +193,8 @@ Bourne-style shell permitted by Debian policy (i.e. not just bash).
 
   - FANCY OUTPUT
 
-"Fancy output" can be overridden by setting FANCYTTY=0 in /etc/default/rcS.
+"Fancy output" can be overridden by setting FANCYTTY=0 in
+/etc/lsb-base-logging.sh .
 
   - OUTPUT FUNCTIONS
 

diff --git a/init-functions b/init-functions
index d8a7e9855373e5c519b6dd469c0c112fe1bd7de4..0bfea9e90d12534e583dce7b5f7e73a0af350e55 100644 (file)
--- a/init-functions
+++ b/init-functions
@@ -425,5 +425,5 @@ for hook in $(run-parts --lsbsysinit --list /lib/lsb/init-functions.d 2>/dev/nul
     [ -r $hook ] && . $hook || true
 done
 
-FANCYTTY=$([ -e /etc/default/rcS ] && . /etc/default/rcS && echo $FANCYTTY)
+FANCYTTY=
 [ -e /etc/lsb-base-logging.sh ] && . /etc/lsb-base-logging.sh || true