Add a quiet mode support so we dont have to force all output to /dev/null.

Package-Manager: portage-2.1_pre3-r1

6 files changed, 58 insertions, 16 deletions

diff --git a/app-admin/showconsole/ChangeLog b/app-admin/showconsole/ChangeLog
index 75b6641f5788..e7c5fec85ee4 100644
--- a/app-admin/showconsole/ChangeLog
+++ b/app-admin/showconsole/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/showconsole
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/showconsole/ChangeLog,v 1.9 2005/11/29 02:22:14 vapier Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/showconsole/ChangeLog,v 1.10 2006/01/29 05:21:36 vapier Exp $
+
+  29 Jan 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/showconsole-1.08-quiet.patch, files/bootlogger.sh,
+  showconsole-1.07.ebuild, showconsole-1.08.ebuild:
+  Add a quiet mode support so we dont have to force all output to /dev/null.
 
 *showconsole-1.08 (29 Nov 2005)
 
diff --git a/app-admin/showconsole/Manifest b/app-admin/showconsole/Manifest
index c4c2efc70f64..d9e8c11c6030 100644
--- a/app-admin/showconsole/Manifest
+++ b/app-admin/showconsole/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f25d1bc6f84bacf147f784a17df1e193 ChangeLog 1293
+MD5 6c55f366334b35ecc07ad22eecad8f46 ChangeLog 1534
 MD5 34f6358be961e4385337135c2de859ef files/1.07-no-TIOCGDEV.patch 819
-MD5 9e771682d403f6fa76f4496b6528af81 files/bootlogger.sh 657
+MD5 f5babd10b4e0ce7a9d34493db3c4a0f4 files/bootlogger.sh 649
 MD5 a081c5c8650672deda68728c8437c846 files/digest-showconsole-1.07 149
 MD5 afbf40a5ea199b97d01d633a2a89ec42 files/digest-showconsole-1.08 68
+MD5 6a9843ec704344429c3f3d594ae6f90e files/showconsole-1.08-quiet.patch 756
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 2dc3669fae2599415ac079d278193262 showconsole-1.07.ebuild 1014
-MD5 adf8e7db150ea83da46ea32abe027729 showconsole-1.08.ebuild 1124
+MD5 5e6e5cbd181e90937be71e1dca935fb0 showconsole-1.07.ebuild 1057
+MD5 dfcb6e71bc1ee86a22a62894a84dd42b showconsole-1.08.ebuild 1160
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDi7vhgIKl8Uu19MoRAuqGAJ47NRa0Ws0Pnh6I4GQ2Xq1HKgZFggCeLCIs
-r504J72F0S2HJAw5MRdt/2g=
-=1HdJ
+iD8DBQFD3FD52+ySkm8kpY0RArLZAKChFvXijXralHGSprwQYowxvoRXWgCglqSU
+D/WeRriFcWIDnlzU+N315I0=
+=/SFn
 -----END PGP SIGNATURE-----
diff --git a/app-admin/showconsole/files/bootlogger.sh b/app-admin/showconsole/files/bootlogger.sh
index 20e4787a7ae5..fc943227c147 100644
--- a/app-admin/showconsole/files/bootlogger.sh
+++ b/app-admin/showconsole/files/bootlogger.sh
@@ -1,7 +1,7 @@
 # /lib/rcscripts/addons/bootlogger.sh:  Handle logging of output at boot
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/showconsole/files/bootlogger.sh,v 1.2 2005/05/31 23:05:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/showconsole/files/bootlogger.sh,v 1.3 2006/01/29 05:21:36 vapier Exp $
 
 if [[ -x /sbin/blogd ]] ; then
 
@@ -18,7 +18,7 @@ bootlog() {
 }
 
 blogd_start() {
-	/sbin/blogd >/dev/null
+	/sbin/blogd -q
 }
 
 blogd_sync() {
diff --git a/app-admin/showconsole/files/showconsole-1.08-quiet.patch b/app-admin/showconsole/files/showconsole-1.08-quiet.patch
new file mode 100644
index 000000000000..d03996056a5e
--- /dev/null
+++ b/app-admin/showconsole/files/showconsole-1.08-quiet.patch
@@ -0,0 +1,34 @@
+--- blogd.c
++++ blogd.c
+@@ -183,6 +183,7 @@
+ {
+     int fd, flags;
+     int ptm, pts, cntrtty = 1;
++    int quiet = 0;
+     pid_t pid, ppid = getppid();
+     char ptsname[NAME_MAX+1];
+     struct termios t;
+@@ -193,7 +194,14 @@
+     myname = basename(*argv);
+ 
+     if (argc > 2)
+-	error("Too many args; usage: %s [/dev/tty<X>]\n", myname);
++	error("Too many args; usage: %s [-q] [/dev/tty<X>]\n", myname);
++
++    if (argc > 1 && strcmp(argv[1], "-q") == 0) {
++	quiet = 1;
++	--argc;
++	if (argc > 2)
++	    argv[1] = argv[2];
++    }
+ 
+     if (argc == 2)
+ 	tty = argv[1];
+@@ -282,6 +289,7 @@
+ 	close(pts);
+ 	close(ptm);
+ 	close(fd);
++	if (!quiet)
+ 	fprintf(stdout, "\rBoot logging started on %s(%s) at %.24s\n", tty, name, stt);
+ 	fflush(stdout);
+ 	exit(0);
diff --git a/app-admin/showconsole/showconsole-1.07.ebuild b/app-admin/showconsole/showconsole-1.07.ebuild
index ae79748ae191..97d2d36fefb7 100644
--- a/app-admin/showconsole/showconsole-1.07.ebuild
+++ b/app-admin/showconsole/showconsole-1.07.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/showconsole/showconsole-1.07.ebuild,v 1.10 2005/10/02 18:39:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/showconsole/showconsole-1.07.ebuild,v 1.11 2006/01/29 05:21:36 vapier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -21,6 +21,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${DISTDIR}"/${P}-suse-update.patch.bz2
 	epatch "${FILESDIR}"/${PV}-no-TIOCGDEV.patch
+	epatch "${FILESDIR}"/${PN}-1.08-quiet.patch
 }
 
 src_compile() {
diff --git a/app-admin/showconsole/showconsole-1.08.ebuild b/app-admin/showconsole/showconsole-1.08.ebuild
index 4d6fa2438474..967e18fcaab5 100644
--- a/app-admin/showconsole/showconsole-1.08.ebuild
+++ b/app-admin/showconsole/showconsole-1.08.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/showconsole/showconsole-1.08.ebuild,v 1.1 2005/11/29 02:22:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/showconsole/showconsole-1.08.ebuild,v 1.2 2006/01/29 05:21:36 vapier Exp $
 
 # This tarball is extracted from SuSe's sysvinit-2.86-#.src.rpm
 # You can find said src rpm via opensuse.org:
-# http://mirrors.kernel.org/opensuse/distribution/SL-OSS-edge/inst-source/suse/src/
+# http://mirrors.kernel.org/opensuse/distribution/SL-OSS-*/inst-source/suse/src/
 
 inherit eutils toolchain-funcs
 
@@ -23,6 +23,7 @@ src_unpack() {
 	unpack ${P}.tar.bz2
 	cd "${S}"
 	epatch "${FILESDIR}"/1.07-no-TIOCGDEV.patch
+	epatch "${FILESDIR}"/${P}-quiet.patch
 }
 
 src_compile() {