diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2000-04-21 21:27:35 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2000-04-21 21:27:35 +0000 |
commit | 4ab13cce897bfd0123fe58b182c6e802e6344b00 (patch) | |
tree | 964c396d985867c66ac651daabb52babaa4a0dd7 /share/man | |
parent | b942e6d2ebe4c7b9bb5cfeb554434e50d85949c0 (diff) |
rc.conf.local support, inspired by chuck yerkes
Diffstat (limited to 'share/man')
-rw-r--r-- | share/man/man8/Makefile | 5 | ||||
-rw-r--r-- | share/man/man8/rc.conf.8 | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/share/man/man8/Makefile b/share/man/man8/Makefile index a1a67afa876..375ba0c7631 100644 --- a/share/man/man8/Makefile +++ b/share/man/man8/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2000/04/11 19:44:42 deraadt Exp $ +# $OpenBSD: Makefile,v 1.27 2000/04/21 21:27:32 deraadt Exp $ # $NetBSD: Makefile,v 1.13 1996/03/28 21:36:40 mark Exp $ # @(#)Makefile 8.1 (Berkeley) 6/5/93 @@ -11,6 +11,7 @@ SUBDIR= man8.amiga man8.hp300 man8.i386 man8.mac68k man8.sparc MLINKS= afterboot.8 faq.8 \ boot_config.8 UKC.8 \ - rc.8 rc.local.8 rc.8 rc.securelevel.8 rc.8 netstart.8 + rc.8 rc.local.8 rc.8 rc.securelevel.8 rc.8 netstart.8 \ + rc.conf.8 rc.conf.local.8 .include <bsd.prog.mk> diff --git a/share/man/man8/rc.conf.8 b/share/man/man8/rc.conf.8 index 04d3c96f543..e0fe5b2c039 100644 --- a/share/man/man8/rc.conf.8 +++ b/share/man/man8/rc.conf.8 @@ -41,6 +41,14 @@ in the series in order to set shell variables used therein to control the behaviour of the scripts. .Pp +As an alternative, it is also possible to leave the +.Pa /etc/rc.conf +file untouched, and instead create and edit a new +.Pa /etc/rc.conf.local +file. +Variables set in this file will override variables previously set in +.Pa /etc/rc.conf . +.Pp There are three sections in this file. The first is used to turn features on or off. For example, whether the system runs the .Nm sendmail |