[Pkg-sysvinit-commits] r1406 - in sysvinit-upstream/trunk: doc man src
Petter Reinholdtsen
pere at alioth.debian.org
Fri Jul 10 19:02:18 UTC 2009
Author: pere
Date: 2009-07-10 19:02:17 +0000 (Fri, 10 Jul 2009)
New Revision: 1406
Modified:
sysvinit-upstream/trunk/doc/Changelog
sysvinit-upstream/trunk/man/init.8
sysvinit-upstream/trunk/src/init.c
Log:
Document -e and -t options for telinit in init(8).
Modified: sysvinit-upstream/trunk/doc/Changelog
===================================================================
--- sysvinit-upstream/trunk/doc/Changelog 2009-07-10 18:59:21 UTC (rev 1405)
+++ sysvinit-upstream/trunk/doc/Changelog 2009-07-10 19:02:17 UTC (rev 1406)
@@ -2,6 +2,7 @@
* Fix typos and do minor updates in the manual pages.
* Correct section of mountpoint(1).
+ * Document -e and -t options for telinit in init(8).
-- Petter Reinholdtsen <pere at debian.org> Fri, 30 Jul 2004 14:14:58 +0200
Modified: sysvinit-upstream/trunk/man/init.8
===================================================================
--- sysvinit-upstream/trunk/man/init.8 2009-07-10 18:59:21 UTC (rev 1405)
+++ sysvinit-upstream/trunk/man/init.8 2009-07-10 19:02:17 UTC (rev 1406)
@@ -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
@@ -141,13 +144,22 @@
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.
.PP
@@ -198,8 +210,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.
Modified: sysvinit-upstream/trunk/src/init.c
===================================================================
--- sysvinit-upstream/trunk/src/init.c 2009-07-10 18:59:21 UTC (rev 1405)
+++ sysvinit-upstream/trunk/src/init.c 2009-07-10 19:02:17 UTC (rev 1406)
@@ -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);
}
More information about the Pkg-sysvinit-commits
mailing list