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

[Thomas Hood]

Author: jdthood-guest
Date: 2006-01-03 21:07:10 +0000 (Tue, 03 Jan 2006)
New Revision: 517

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/13_doc_telinit.dpatch
Log:
Improve documentation of init -e and -t options

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-01-03 20:27:29 UTC (rev 516)
+++ sysvinit/trunk/debian/changelog	2006-01-03 21:07:10 UTC (rev 517)
@@ -33,6 +33,7 @@
     oldstable
   * sysvinit: Depend on libc6 rather than Pre-Depending on it; we don't
     do anything special in the preinsts
+  * Improve documentation of init -e and -t options
   * Tweak descriptions
   * Add READMEs for remaining runlevel dirs  (Closes: #242957)
   * Previous release also closes: #227540

Modified: sysvinit/trunk/debian/patches/13_doc_telinit.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/13_doc_telinit.dpatch	2006-01-03 20:27:29 UTC (rev 516)
+++ sysvinit/trunk/debian/patches/13_doc_telinit.dpatch	2006-01-03 21:07:10 UTC (rev 517)
@@ -5,28 +5,67 @@
 ## DP: Document -e and -t option in telinit.  Fixes bug #272657.
 
 @DPATCH@
-Index: sysvinit/src/init.c
-===================================================================
---- sysvinit/src/init.c	(revisjon 70)
-+++ sysvinit/src/init.c	(arbeidskopi)
+diff -urNad --exclude=CVS --exclude=.svn ./man/init.8 /tmp/dpep-work.qkdAnc/trunk/man/init.8
+--- ./man/init.8	2006-01-03 22:00:18.000000000 +0100
++++ /tmp/dpep-work.qkdAnc/trunk/man/init.8	2006-01-03 22:00:19.000000000 +0100
+@@ -12,12 +12,15 @@
+ .RB [ " -a " ]
+ .RB [ " -s " ]
+ .RB [ " -b " ]
+-.RB [ " -z xxx " ]
++[ \fB\-z\fP \fIxxx\fP ]
+ .RB [ " 0123456Ss " ]
+ .br
+ .B /sbin/telinit
+-.RB [ " \-t sec " ]
++[ \fB\-t\fP \fISECONDS\fP ]
+ .RB [ " 0123456sSQqabcUu " ]
++.br
++.B /sbin/telinit
++[ \fB\-e\fP \fIVAR\fP[\fB=\fP\fIVAL\fP] ]
+ .\"}}}
+ .\"{{{  Description
+ .SH DESCRIPTION
+@@ -158,9 +161,17 @@
+ \fB/etc/inittab\fP file happens. Run level should be one of \fBSs12345\fP,
+ otherwise request would be silently ignored.
+ .PP
+-\fBtelinit\fP can also tell \fBinit\fP how long it should wait
++\fBtelinit\fP can tell \fBinit\fP how long it should wait
+ between sending processes the SIGTERM and SIGKILL signals.  The default
+-is 5 seconds, but this can be changed with the \fB-t sec\fP option.
++is 5 seconds, but this can be changed with the \fB-t\fP option.
++.PP
++\fBtelinit -e\fP tells \fBinit\fP to change its environment 
++variable settings.
++The argument of \fB-e\fP is either of the form \fIVAR\fP=\fIVAL\fP
++which sets variable \fIVAR\fP to value \fIVAL\fP,
++or of the form \fIVAR\fP
++(without an equality sign)
++which unsets variable \fIVAR\fP.
+ .PP
+ \fBtelinit\fP can be invoked only by users with appropriate
+ privileges.
+@@ -212,8 +223,8 @@
+ command line manually.
+ .PP
+ .TP 0.5i
+-.B -z xxx
+-The argument to -z is ignored. You can use this to expand the command
++.BI "-z " xxx
++The argument to \fB-z\fP is ignored. You can use this to expand the command
+ line a bit, so that it takes some more space on the stack. \fBInit\fP
+ can then manipulate the command line so that \fBps\fP(1) shows
+ the current runlevel.
+diff -urNad --exclude=CVS --exclude=.svn ./src/init.c /tmp/dpep-work.qkdAnc/trunk/src/init.c
+--- ./src/init.c	2005-12-02 17:22:57.000000000 +0100
++++ /tmp/dpep-work.qkdAnc/trunk/src/init.c	2006-01-03 22:05:38.000000000 +0100
 @@ -2495,7 +2495,7 @@
   */
  void usage(char *s)
  {
 -	fprintf(stderr, "Usage: %s 0123456SsQqAaBbCcUu\n", s);
-+	fprintf(stderr, "Usage: %s [-e env ] [-t seconds] 0123456SsQqAaBbCcUu\n", s);
++	fprintf(stderr, "Usage: %s {-e VAR[=VAL] | [-t SECONDS] {0|1|2|3|4|5|6|S|s|Q|q|A|a|B|b|C|c|U|u}}\n", s);
  	exit(1);
  }
  
-Index: sysvinit/man/init.8
-===================================================================
---- sysvinit/man/init.8	(revisjon 75)
-+++ sysvinit/man/init.8	(arbeidskopi)
-@@ -16,6 +16,7 @@
- .RB [ " 0123456Ss " ]
- .br
- .B /sbin/telinit
-+.RB [ " \-e env " ]
- .RB [ " \-t sec " ]
- .RB [ " 0123456sSQqabcUu " ]
- .\"}}}