From 4e245b0e3898d02cf145cacf18264b307c01e13b Mon Sep 17 00:00:00 2001 From: Thomas Nikolajsen Date: Sun, 16 Dec 2007 01:58:38 +0000 Subject: [PATCH] Delete obsolete rc.* manual pages. Correct some /etc/rc.d/* references and add rc.d history to rc.8. --- etc/Makefile | 4 +++- share/man/man8/Makefile | 7 +++--- share/man/man8/rc.8 | 57 +++++++++++++++++++++++-------------------------- 3 files changed, 33 insertions(+), 35 deletions(-) diff --git a/etc/Makefile b/etc/Makefile index dad14b862e..8251de4be2 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,6 +1,6 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 # $FreeBSD: src/etc/Makefile,v 1.219.2.38 2003/03/04 09:49:00 ru Exp $ -# $DragonFly: src/etc/Makefile,v 1.196 2007/11/19 18:23:36 swildner Exp $ +# $DragonFly: src/etc/Makefile,v 1.197 2007/12/16 01:58:38 thomas Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -545,6 +545,8 @@ upgrade_etc: preupgrade rm -f ${DESTDIR}/usr/include/net/intrq.h rm -f ${DESTDIR}/usr/share/games/fortune/freebsd-tips rm -f ${DESTDIR}/usr/share/games/fortune/freebsd-tips.dat + csh -c "rm -f ${DESTDIR}/usr/share/man/{man,cat}8/rc.{atm,early,network,serial}.8.gz" + csh -c "rm -f ${DESTDIR}/usr/share/man/{man,cat}8/i386/rc.i386.8.gz" ldconfig -R .if !defined(BINARY_UPGRADE) # binary upgrade just copies these nodes .if !defined(NOMAN) diff --git a/share/man/man8/Makefile b/share/man/man8/Makefile index b3ffd1fbfa..56c4e21a0e 100644 --- a/share/man/man8/Makefile +++ b/share/man/man8/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD: src/share/man/man8/Makefile,v 1.13.2.12 2002/07/16 14:05:30 ru Exp $ -# $DragonFly: src/share/man/man8/Makefile,v 1.8 2006/04/15 07:44:48 swildner Exp $ +# $DragonFly: src/share/man/man8/Makefile,v 1.9 2007/12/16 01:58:38 thomas Exp $ MAN= adding_user.8 \ crash.8 \ @@ -12,12 +12,11 @@ MAN= adding_user.8 \ sticky.8 \ yp.8 -MLINKS= rc.8 rc.d.8 rc.8 rc.early.8 rc.8 rc.serial.8 rc.8 rc.network.8 -MLINKS+=rc.8 rc.firewall.8 rc.8 rc.atm.8 rc.8 rc.local.8 rc.8 rc.shutdown.8 +MLINKS= rc.8 rc.d.8 +MLINKS+=rc.8 rc.firewall.8 rc.8 rc.local.8 rc.8 rc.shutdown.8 MLINKS+=yp.8 YP.8 yp.8 NIS.8 yp.8 nis.8 .if ${MACHINE_ARCH} == "i386" -MLINKS+=rc.8 ${MACHINE_ARCH}/rc.${MACHINE_ARCH}.8 SUBDIR= man8.${MACHINE_ARCH} .endif diff --git a/share/man/man8/rc.8 b/share/man/man8/rc.8 index 3c1d0c7d74..02b5fd67d4 100644 --- a/share/man/man8/rc.8 +++ b/share/man/man8/rc.8 @@ -34,8 +34,8 @@ .\" .\" @(#)rc.8 8.2 (Berkeley) 12/11/93 .\" $FreeBSD: src/share/man/man8/rc.8,v 1.22 2002/12/12 17:25:58 ru Exp $ -.\" $DragonFly: src/share/man/man8/rc.8,v 1.10 2007/10/14 00:14:36 swildner Exp $ -.Dd October 13, 2007 +.\" $DragonFly: src/share/man/man8/rc.8,v 1.11 2007/12/16 01:58:38 thomas Exp $ +.Dd December 16, 2007 .Dt RC 8 .Os .Sh NAME @@ -189,12 +189,12 @@ In order of startup, these are: .It Pa NETWORKING Ensure basic network services are running, including general network configuration -.Pq Pa network1 , network2 , network3 . +.Pq Pa netif , routing , network_ipv6 , isdnd, ppp-user . .It Pa SERVERS Ensure basic services (such as -.Pa NETWORKING , ppp-user , syslogd , +.Pa NETWORKING and -.Pa isdnd ) +.Pa syslogd ) exist for services that start early (such as .Pa named ) , because they are required by @@ -202,16 +202,16 @@ because they are required by below. .It Pa DAEMON Check-point before all general purpose daemons such as -.Pa lpd +.Pa dhcpd , ftpd and -.Pa ntpd . +.Pa lpd . .It Pa LOGIN Check-point before user login services .Pa ( inetd and .Pa sshd ) , as well as services which might run commands as users -.Pa ( cron +.Pa ( cron , jail and .Pa sendmail ) . .El @@ -377,28 +377,16 @@ is not set, when going from single-user to multi-user mode for example, the script does not do anything. .Pp The -.Nm rc.early -script is run very early in the startup process, immediately before the -file system check. -The -.Nm rc.early -script is deprecated. -Any commands in this -file should be separated out into -.Nm rc.d/ -style scripts and integrated into the -.Nm -system. -.Pp -The .Pa /etc/rc.d/local script can execute scripts from multiple .Nm rc.d/ directories. The default locations are -.Pa /usr/local/etc/rc.d/ +.Pa /usr/pkg/etc/rc.d/ , +.Pa /usr/local/etc/rc.d/ , +.Pa /usr/pkg/xorg/etc/rc.d/ and -.Pa /usr/pkg/xorg/etc/rc.d/ , +.Pa /usr/X11R6/etc/rc.d/ , but these may be overridden with the .Va local_startup .Xr rc.conf 5 @@ -409,18 +397,18 @@ The script is used to set any special configurations for serial devices. .Pp The -.Pa /etc/rc.d/network* +.Pa /etc/rc.d/{net*,routing} scripts are used to start the network. The network is started in several passes. The first pass, -.Pa /etc/rc.d/network1 , -sets the hostname and domainname and configures the network +.Pa /etc/rc.d/netif , +configures the network interfaces. The -.Pa /etc/rc.d/network2 +.Pa /etc/rc.d/routing script starts routing and sets routing options. The -.Pa /etc/rc.d/network3 +.Pa /etc/rc.d/netoptions script sets additional networking options. Finally, the .Pa /etc/rc.d/network_ipv6 @@ -428,7 +416,9 @@ script configures IPv6 interfaces and options. .Pp The .Nm rc.firewall -script is used to configure rules for the kernel based firewall +script is used to configure rules for the +.Xr ipfw 4 +kernel based firewall service. It has several possible options: .Pp @@ -562,6 +552,7 @@ at shutdown, the explicit is unnecessary, but is often included. .Sh SEE ALSO .Xr kill 1 , +.Xr ipfw 4 , .Xr rc.conf 5 , .Xr init 8 , .Xr rcorder 8 , @@ -574,3 +565,9 @@ The .Nm utility appeared in .Bx 4.0 . +The +.Nm rc.d/ +facility was implemented in +.Nx 1.5 +and appeared in +.Dx 1.0 . -- 2.11.4.GIT