diff options
| author |   todd <todd@openbsd.org> | 2000-06-18 19:02:24 +0000 |
|---|---|---|
| committer | todd <todd@openbsd.org> | 2000-06-18 19:02:24 +0000 |
| commit | 7234cb5a4c6e4e77cf84db3218e4e679afa4a869 (patch) | |
| tree | d5f70884d5a62d6f6b88db3ce9e02d804ae32d96 | |
| parent | fix .Bl (diff) | |
| download | wireguard-openbsd-7234cb5a4c6e4e77cf84db3218e4e679afa4a869.tar.xz wireguard-openbsd-7234cb5a4c6e4e77cf84db3218e4e679afa4a869.zip | |
rc.conf now parses ${local_rcconf} internally; closes pr 1259
| -rw-r--r-- | etc/netstart | 5 | ||||
| -rw-r--r-- | etc/rc.conf | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/etc/netstart b/etc/netstart index caec08caecf..4cf032a921d 100644 --- a/etc/netstart +++ b/etc/netstart @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: netstart,v 1.70 2000/05/08 21:44:39 todd Exp $ +# $OpenBSD: netstart,v 1.71 2000/06/18 19:02:24 todd Exp $ # Returns true if $1 contains only alphanumerics isalphanumeric() { @@ -26,9 +26,6 @@ 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 f110d69141f..7354a99ba72 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: rc.conf,v 1.48 2000/05/30 22:20:17 mickey Exp $ +# $OpenBSD: rc.conf,v 1.49 2000/06/18 19:02:28 todd 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 @@ afsd_flags=-z # Flags passed to afsd shlib_dirs= # extra directories for ldconfig local_rcconf="/etc/rc.conf.local" + +[ -f ${local_rcconf} ] && . ${local_rcconf} # Do not edit this line |