src-test2/sbin/init, branch stable/5

MFC to RELENG_5:

2005-10-04T18:00:43Z

| Fix system shutdown timeout handling by again supporting longer running | shutdown procedures (which have a duration of more than 120 seconds). | | We have two user-space affecting shutdown timeouts: a "soft" one in | /etc/rc.shutdown and a "hard" one in init(8). The first one can be | configured via /etc/rc.conf variable "rcshutdown_timeout" and defaults | to 30 seconds. The second one was originally (in 1998) intended to be | configured via sysctl(8) variable "kern.shutdown_timeout" and defaults | to 120 seconds. | | Unfortunately, the "kern.shutdown_timeout" was declared "unused" in 1999 | (as it obviously is actually not used within the kernel itself) and | hence was intentionally but misleadingly removed in revision 1.107 from | init_main.c. Kernel sysctl(8) variables are certainly a wrong way to | control user-space processes in general, but in this particular case the | sysctl(8) variable should have remained as it supports init(8), which | isn't passed command line flags (which in turn could have been set via | /etc/rc.conf), etc. | | As there is already a similar "kern.init_path" sysctl(8) variable which | directly affects init(8), resurrect the init(8) shutdown timeout under | sysctl(8) variable "kern.init_shutdown_timeout". But this time document | it as being intentionally unused within the kernel and used by init(8). | Also document it in the manpages init(8) and rc.conf(5). | | Reviewed by: phk | MFC after: 2 weeks | | Revision Changes Path | 1.48 +7 -1 src/sbin/init/init.8 | 1.61 +1 -1 src/sbin/init/init.c | 1.264 +16 -1 src/share/man/man5/rc.conf.5 | 1.257 +11 -0 src/sys/kern/init_main.c

MFC: 1.59. Fix nonexistant device support in init.

2004-10-01T06:08:38Z

Approved by: re@ (scottl)

Add references to pf(4) and pfctl(8) at the description of

2004-07-22T10:38:13Z

securelevel = 3. PR: docs/69417 Submitted by: Janos Mohacsi (mohacsi(at)niif(dot)hu)

Mechanically kill hard sentence breaks.

2004-07-02T21:45:06Z

Assorted markup, grammar, and spelling fixes.

2004-05-17T08:35:43Z

Remove advertising clause from University of California Regent's license,

2004-04-09T19:58:40Z

per letter dated July 22, 1999. Approved by: core, imp

Fixed misspellings of 0 as NULL.

2004-03-11T10:01:12Z

style.Makefile(5):

2004-02-23T20:25:27Z

Use WARNS?= instead of WARNS=.

Mention that securelevel 1 also blocks access to /dev/io if it

2004-02-20T21:38:23Z

exists (not all platforms have it).

Fix the case where one goes from zero to more than zero items enabled

2003-12-05T04:28:03Z

in /etc/ttys. Before this fix, once the count of active services reaches 0, one could never restart any more without a reboot. Steve Passe did the leg work on this patch. After he found the fix, we discovered that an identical fix had been made to NetBSD. Approved by: re@ Approval tool: peril sensitive sunglasses