summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
Diffstat (limited to 'etc')
-rw-r--r--etc/netstart5
-rw-r--r--etc/rc.conf4
2 files changed, 7 insertions, 2 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"