Browse Source

rc.conf.local support, inspired by chuck yerkes

OPENBSD_2_7
deraadt 24 years ago
parent
commit
90d3a6dee4
2 changed files with 7 additions and 2 deletions
  1. +4
    -1
      src/etc/netstart
  2. +3
    -1
      src/etc/rc.conf

+ 4
- 1
src/etc/netstart View File

@ -1,6 +1,6 @@
#!/bin/sh - #!/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 # Returns true if $1 contains only alphanumerics
isalphanumeric() { isalphanumeric() {
@ -26,6 +26,9 @@ fi
# pick up option configuration # pick up option configuration
. /etc/rc.conf . /etc/rc.conf
if [ -f $local_rcconf ]; then
. $local_rcconf
fi
# Configure the IP filter before configuring network interfaces # Configure the IP filter before configuring network interfaces
if [ X"${ipfilter}" = X"YES" -a -f "${ipfilter_rules}" ]; then if [ X"${ipfilter}" = X"YES" -a -f "${ipfilter_rules}" ]; then


+ 3
- 1
src/etc/rc.conf View File

@ -1,6 +1,6 @@
#!/bin/sh - #!/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 # set these to "NO" to turn them off. otherwise, they're used as flags
routed_flags=NO # for normal use: "-q" 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 afs_device=/dev/xfs0 # Device used by afsd
afsd_flags=-z # Flags passed to afsd afsd_flags=-z # Flags passed to afsd
shlib_dirs= # extra directories for ldconfig shlib_dirs= # extra directories for ldconfig
local_rcconf="/etc/rc.conf.local"

Loading…
Cancel
Save