it seems in fifteen years, and eleven revisions of this page, we have never

actually had an update command; make one more, final, edit...

ok krw ian deraadt

3 files changed, 22 insertions, 89 deletions

diff --git a/share/man/man8/Makefile b/share/man/man8/Makefile
index cbdecc90efb..39e02d87611 100644
--- a/share/man/man8/Makefile
+++ b/share/man/man8/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.77 2011/04/25 14:12:33 jmc Exp $
+#	$OpenBSD: Makefile,v 1.78 2011/04/29 07:08:27 jmc Exp $
 #	$NetBSD: Makefile,v 1.13 1996/03/28 21:36:40 mark Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
@@ -7,7 +7,7 @@ MAN=	afterboot.8 boot_config.8 compat_aout.8 \
 	compat_svr4.8 crash.8 daily.8 dhcp.8 \
 	diskless.8 genassym.sh.8 intro.8 netstart.8 rc.8 \
 	rc.conf.8 rc.d.8 rc.shutdown.8 rc.subr.8 release.8 \
-	security.8 ssl.8 starttls.8 sticky.8 update.8 yp.8
+	security.8 ssl.8 starttls.8 sticky.8 yp.8
 
 MLINKS+=boot_config.8 UKC.8
 MLINKS+=daily.8 weekly.8 daily.8 monthly.8
diff --git a/share/man/man8/rc.8 b/share/man/man8/rc.8
index 1f665194abe..0ec0c3c7b17 100644
--- a/share/man/man8/rc.8
+++ b/share/man/man8/rc.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rc.8,v 1.35 2011/04/27 12:31:02 jmc Exp $
+.\"	$OpenBSD: rc.8,v 1.36 2011/04/29 07:08:27 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"     @(#)rc.8	8.2 (Berkeley) 12/11/93
 .\"
-.Dd $Mdocdate: April 27 2011 $
+.Dd $Mdocdate: April 29 2011 $
 .Dt RC 8
 .Os
 .Sh NAME
@@ -44,8 +44,7 @@
 .Nm rc
 is the command script that is invoked by
 .Xr init 8
-when booting into multi-user mode,
-and after single user mode is exited.
+when the system starts up.
 It performs system housekeeping chores and starts up system daemons.
 Additionally,
 .Nm rc
@@ -66,9 +65,7 @@ scripts hold commands which are pertinent only to a specific site.
 .Pp
 All of these startup scripts are controlled to some
 extent by variables defined in
-.Xr rc.conf 8
-and
-.Xr rc.conf.local 8 ,
+.Xr rc.conf 8 ,
 which specify which daemons and services to run.
 .Pp
 Before
@@ -79,12 +76,11 @@ it sets the process priority, umask, and resource limits according to the
 .Dq daemon
 login class as described in
 .Xr login.conf 5 .
-.Pp
-When booting into multi-user mode
+It then starts
 .Nm rc
-is invoked with the argument
-.Em autoboot .
-The first portion of
+and attempts to execute the sequence of commands therein.
+.Pp
+The first part of
 .Nm rc
 runs an
 .Xr fsck 8
@@ -101,15 +97,11 @@ is run.
 However, if the file
 .Pa /fastboot
 exists,
-.Xr fsck 8
-will not be invoked during this boot.
-This file is then removed so that fsck will be run on subsequent boots.
+fsck will not be invoked.
+The file is then removed so that fsck will be run on subsequent boots.
 .Pp
 The second part of
-.Nm rc ,
-which is also run by
-.Xr init 8
-after a single user shell terminates,
+.Nm rc
 then asks
 .Xr rc.conf 8
 for configuration variables,
@@ -121,6 +113,15 @@ and saves any possible core image that might have been
 generated as a result of a system crash, with
 .Xr savecore 8 .
 .Pp
+If at any point the boot script fails,
+.Xr init 8
+enters single-user mode,
+allowing the superuser a shell on the console.
+On exiting this mode,
+init again invokes
+.Nm rc ,
+but this time without performing the file system preen.
+.Pp
 Before
 .Nm rc
 starts most system daemons,
diff --git a/share/man/man8/update.8 b/share/man/man8/update.8
deleted file mode 100644
index 1fe5eeea91f..00000000000
--- a/share/man/man8/update.8
+++ /dev/null
@@ -1,68 +0,0 @@
-.\"
-.\" Copyright (c) 1996 SigmaSoft, Th. Lockert
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\"	$OpenBSD: update.8,v 1.11 2007/05/31 19:19:59 jmc Exp $
-.\"
-.Dd $Mdocdate: May 31 2007 $
-.Dt UPDATE 8
-.Os
-.Sh NAME
-.Nm update
-.Nd flush internal filesystem caches to disk frequently
-.Sh SYNOPSIS
-.Nm update
-.Sh DESCRIPTION
-The
-.Nm update
-command no longer exists, but has been incorporated into
-the kernel where it will flush dirty buffers that have not
-been touched for thirty seconds or more.
-.Pp
-The same effect can be obtained by using the
-.Xr sync 8
-command, although the in-kernel
-.Nm update
-process will do this in a staggered manner.
-.Sh SEE ALSO
-.Xr sync 2 ,
-.Xr fsck 8 ,
-.Xr init 8 ,
-.Xr sync 8
-.Sh HISTORY
-An
-.Nm update
-command appeared in
-.At v6 .
-.Pp
-The
-.Nm update
-command was incorporated into the kernel in
-.Ox 1.2 .
-.Sh BUGS
-It is possible on some systems, that a
-.Xr sync 8
-occurring simultaneously with a crash may cause
-file system damage.
-See
-.Xr fsck 8 .