diff options
| author |   deraadt <deraadt@openbsd.org> | 2000-04-21 21:27:32 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2000-04-21 21:27:32 +0000 |
| commit | abca3f75146a512a0ed468800103f5597952caf2 (patch) | |
| tree | 3ef4eb52cc2ddf8f4545fc964cd9050b26c21d3f | |
| parent | a little bit of glue to call openssl; mark@moxienet.com (diff) | |
| download | wireguard-openbsd-abca3f75146a512a0ed468800103f5597952caf2.tar.xz wireguard-openbsd-abca3f75146a512a0ed468800103f5597952caf2.zip | |
rc.conf.local support, inspired by chuck yerkes
| -rw-r--r-- | etc/netstart | 5 | ||||
| -rw-r--r-- | etc/rc.conf | 4 | ||||
| -rw-r--r-- | share/man/man8/Makefile | 5 | ||||
| -rw-r--r-- | share/man/man8/rc.conf.8 | 8 |
4 files changed, 18 insertions, 4 deletions
diff --git a/etc/netstart b/etc/netstart index df2f633a322..ddfc083a77a 100644 --- a/etc/netstart +++ b/etc/netstart @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: netstart,v 1.68 2000/04/04 13:44:51 millert Exp $ +# $OpenBSD: netstart,v 1.69 2000/04/21 21:27:34 deraadt Exp $ # Returns true if $1 contains only alphanumerics isalphanumeric() { @@ -26,6 +26,9 @@ fi # pick up option configuration . /etc/rc.conf +if [ -f $local_rcconf ]; then + . $local_rcconf +fi # Configure the IP filter before configuring network interfaces if [ X"${ipfilter}" = X"YES" -a -f "${ipfilter_rules}" ]; then diff --git a/etc/rc.conf b/etc/rc.conf index 5310ecec3a8..9e5fc193325 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: rc.conf,v 1.44 2000/02/28 17:28:35 itojun Exp $ +# $OpenBSD: rc.conf,v 1.45 2000/04/21 21:27:34 deraadt Exp $ # set these to "NO" to turn them off. otherwise, they're used as flags routed_flags=NO # for normal use: "-q" @@ -80,3 +80,5 @@ afs_mount_point=/afs # Mountpoint for AFS afs_device=/dev/xfs0 # Device used by afsd afsd_flags=-z # Flags passed to afsd shlib_dirs= # extra directories for ldconfig + +local_rcconf="/etc/rc.conf.local" 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 |