rpms/SysVinit/devel sysvinit-2.86-quiet.patch, NONE, 1.1 SysVinit.spec, 1.46, 1.47

[fedora-cvs-commits redhat com]

Author: notting

Update of /cvs/dist/rpms/SysVinit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9394

Modified Files:
	SysVinit.spec 
Added Files:
	sysvinit-2.86-quiet.patch 
Log Message:
be quiet when booted with 'quiet'


sysvinit-2.86-quiet.patch:
 init.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE sysvinit-2.86-quiet.patch ---
--- sysvinit-2.86/src/init.c.silence	2006-08-08 20:50:37.000000000 -0400
+++ sysvinit-2.86/src/init.c	2006-08-08 20:54:24.000000000 -0400
@@ -117,6 +117,7 @@
 char *console_dev;		/* Console device. */
 int pipe_fd = -1;		/* /dev/initctl */
 int did_boot = 0;		/* Did we already do BOOT* stuff? */
+int quiet = 0;			/* Should we be relatively silent? */
 int main(int, char **);
 
 /*	Used by re-exec part */
@@ -1673,7 +1674,7 @@
 			initlog(L_SY, "Trying to re-exec init");
 			return 'U';
 		default:
-		  	initlog(L_VB, "Switching to runlevel: %c", foo);
+		  	if (!quiet) initlog(L_VB, "Switching to runlevel: %c", foo);
 	}
 
 	if (foo == 'Q') return runlevel;
@@ -2425,7 +2426,7 @@
   	/*
 	 *	Say hello to the world
 	 */
-  	initlog(L_CO, bootmsg, "booting");
+  	if (!quiet) initlog(L_CO, bootmsg, "booting");
 
   	/*
 	 *	See if we have to start an emergency shell.
@@ -2657,6 +2658,8 @@
 		else if (!strcmp(argv[f], "-z")) {
 			/* Ignore -z xxx */
 			if (argv[f + 1]) f++;
+		} else if (!strcmp(argv[f], "quiet")) {
+			quiet = 1;
 		} else if (strchr("0123456789sS", argv[f][0])
 			&& strlen(argv[f]) == 1)
 			dfl_level = argv[f][0];


Index: SysVinit.spec
===================================================================
RCS file: /cvs/dist/rpms/SysVinit/devel/SysVinit.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- SysVinit.spec	19 Jul 2006 14:31:10 -0000	1.46
+++ SysVinit.spec	9 Aug 2006 01:02:33 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: Programs which control basic system processes.
 Name: SysVinit
 Version: 2.86
-Release: 6
+Release: 7
 License: GPL
 Group: System Environment/Base
 Source: ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-%{version}.tar.gz
@@ -130,6 +130,9 @@
 /dev/initctl
 
 %changelog
+* Tue Aug  8 2006 Bill Nottingham <notting redhat com> - 2.86-7
+- be slightly less verbose when booted with 'quiet'
+
 * Wed Jul 19 2006 Bill Nottingham <notting redhat com> - 2.86-6
 - fix IPv6 patch (<mzazrive redhat com>)