#! /bin/sh /usr/share/dpatch/dpatch-run

## 13_doc_telinit.dpatch by Petter Reinholdtsen

##

## All lines beginning with `## DP:' are a description of the patch.

## DP: Document -e and -t option in telinit.  Fixes bug #272657.

@DPATCH@

diff -urNad --exclude=CVS --exclude=.svn ./man/init.8 /tmp/dpep-work.onJlGf/trunk/man/init.8

--- ./man/init.8	2006-01-04 11:37:18.000000000 +0100

+++ /tmp/dpep-work.onJlGf/trunk/man/init.8	2006-01-04 11:37:34.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

@@ -155,12 +158,21 @@

 tell \fBinit\fP to switch to single user mode.

 .IP "\fBU\fP or \fBu\fP"

 tell \fBinit\fP to re-execute itself (preserving the state). No re-examining of 

-\fB/etc/inittab\fP file happens. Run level should be one of \fBSs12345\fP,

+\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 the environment

+for processes it spawns.

+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 +224,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.onJlGf/trunk/src/init.c

--- ./src/init.c	2005-12-02 17:22:57.000000000 +0100

+++ /tmp/dpep-work.onJlGf/trunk/src/init.c	2006-01-04 11:37:19.000000000 +0100

@@ -2495,7 +2495,7 @@

  */

 void usage(char *s)

 {

-	fprintf(stderr, "Usage: %s 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);

 }