[Pkg-sysvinit-commits] r1091 - in sysvinit/trunk/debian: . patches

[pere at alioth.debian.org]

Author: pere
Date: 2007-12-23 16:08:22 +0000 (Sun, 23 Dec 2007)
New Revision: 1091

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/68_init_quiet.dpatch
Log:
  * Extend the 68_init_quiet patch to also suppress the "Switching to
    runlevel" message.  Based on patch from Fedora.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2007-12-23 15:54:09 UTC (rev 1090)
+++ sysvinit/trunk/debian/changelog	2007-12-23 16:08:22 UTC (rev 1091)
@@ -18,6 +18,8 @@
   * Make sure init.d/rc do not complain because the new progress bar
     API is unavailable (Closes: #457544).
   * New patch 26_last_ipv6 from Fedora to recognize more IPv6 addresses.
+  * Extend the 68_init_quiet patch to also suppress the "Switching to
+    runlevel" message.  Based on patch from Fedora.
 
  -- Petter Reinholdtsen <pere at debian.org>  Sun, 23 Dec 2007 10:03:48 +0100
 

Modified: sysvinit/trunk/debian/patches/68_init_quiet.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/68_init_quiet.dpatch	2007-12-23 15:54:09 UTC (rev 1090)
+++ sysvinit/trunk/debian/patches/68_init_quiet.dpatch	2007-12-23 16:08:22 UTC (rev 1091)
@@ -4,6 +4,9 @@
 If the kernel was told to be quiet, let init be quiet too.  Based on
 patch from ubuntu, but using different activating variable.
 
+The patch to quiet down the 'switching to runlevel' message is based
+on the sysvinit-2.86-quiet.patch file from Fedora.
+
 WARNING: This patch do not work because the 'quiet' kernel argument is
 	 removed by the kernel before init is called.  To use the
 	 'quiet' kernel argument, /proc/cmdline will need to be
@@ -20,6 +23,16 @@
  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 (!quietinit)
++				initlog(L_VB, "Switching to runlevel: %c", foo);
+ 	}
+ 
+ 	if (foo == 'Q') return runlevel;
 @@ -2423,7 +2424,8 @@
    	/*
  	 *	Say hello to the world