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

The FANCYTTY shell variable is sourced from /etc/default/rcS before
etc/lsb-base-logging.sh .

- Systems with an administrator-provided /etc/lsb-base-logging.sh keep
  working.
- Systems without /etc/lsb-base-logging.sh can now override FANCYTTY in
  /etc/default/rcS too.

Thanks-To: Roger Leigh <rleigh@codelibre.net>
Reported-by: Stanislav Maslovski <stanislav.maslovski@gmail.com>
Closes: #673207
Git-Dch: Full

diff --git a/debian/lsb-base.NEWS b/debian/lsb-base.NEWS
index 476ddc600987894508c0e9d68cb03aaaf48915eb..40c30feba7ce1a596202188640f6ac16274a2ee6 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/lsb-base-logging.sh configuration file.
+  in the /etc/default/rcS 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 717fc7cfd344c1d1b228a3c7263dd48e9bbd3f8a..2a3637ce34238a76f7a995114ef1dbf990915469 100644 (file)
--- a/debian/lsb-base.README.Debian
+++ b/debian/lsb-base.README.Debian
@@ -191,7 +191,11 @@ If supplied, this script fragment should be compatible with any Debian
 /bin/sh, as init scripts sourcing this file may be running under any
 Bourne-style shell permitted by Debian policy (i.e. not just bash).
 
-"Fancy output" can be overridden by setting FANCYTTY=0 in this file.
+  - FANCY OUTPUT
+
+"Fancy output" can be overridden by setting FANCYTTY=0 in /etc/default/rcS.
+
+  - OUTPUT FUNCTIONS
 
 From lsb-base 3.2-14, you can use the following hook functions which
 are called by the appropriate functions, instead of supplying your own

diff --git a/init-functions b/init-functions
index 5c47bf32674dd574562096b35ce5d6009ac73aac..d6a65906f7e28334442ff265a1f1881d8f2a1744 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=
+FANCYTTY=$([ -e /etc/default/rcS ] && . /etc/default/rcS && echo $FANCYTTY)
 [ -e /etc/lsb-base-logging.sh ] && . /etc/lsb-base-logging.sh || true