Browse Source

rc.conf now parses ${local_rcconf} internally; closes pr 1259

OPENBSD_2_8
todd 24 years ago
parent
commit
3894d87b4a
2 changed files with 4 additions and 5 deletions
  1. +1
    -4
      src/etc/netstart
  2. +3
    -1
      src/etc/rc.conf

+ 1
- 4
src/etc/netstart View File

@ -1,6 +1,6 @@
#!/bin/sh - #!/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 # Returns true if $1 contains only alphanumerics
isalphanumeric() { isalphanumeric() {
@ -26,9 +26,6 @@ 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.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 # 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 @@ 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" local_rcconf="/etc/rc.conf.local"
[ -f ${local_rcconf} ] && . ${local_rcconf} # Do not edit this line

Loading…
Cancel
Save