Tweak previous commit. Only sense the configuration if network_interfaces

is set to "auto".  Any network_interfaces settings will be treated as
before.
This commit is contained in:
Peter Wemm 1999-07-08 18:56:04 +00:00
parent 025037833c
commit d45821b19b
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=48687
8 changed files with 37 additions and 22 deletions

View File

@ -9,7 +9,7 @@
#
# All arguments must be in double or single quotes.
#
# $Id: rc.conf,v 1.15 1999/07/07 01:19:15 hosokawa Exp $
# $Id: rc.conf,v 1.16 1999/07/07 12:49:47 peter Exp $
##############################################################
### Important initial Boot-time options ####################
@ -44,6 +44,7 @@ natd_flags="" # Additional flags for natd.
tcp_extensions="NO" # Set to Yes to turn on RFC1323 extensions.
log_in_vain="NO" # Disallow bad connection logging (or YES).
tcp_keepalive="YES" # Kill dead TCP connections (or NO).
network_interfaces="auto" # List of network interfaces (or "auto").
ifconfig_lo0="inet 127.0.0.1" # default loopback device configuration.
#ifconfig_lo0_alias0="inet 127.0.0.254 netmask 0xffffffff" # Sample alias entry.
#

View File

@ -1,6 +1,6 @@
#!/bin/sh -
#
# $Id: rc.network,v 1.47 1999/06/08 13:00:30 brian Exp $
# $Id: rc.network,v 1.48 1999/07/07 12:49:45 peter Exp $
# From: @(#)netstart 5.9 (Berkeley) 3/30/91
# Note that almost all the user-configurable behavior is no longer in
@ -51,8 +51,10 @@ network_pass1() {
done
# Set up all the network interfaces, calling startup scripts if needed
interfaces="`ifconfig -l`"
for ifn in ${interfaces}; do
if [ "x${network_interfaces}" = "xauto" ]; then
network_interfaces="`ifconfig -l`"
fi
for ifn in ${network_interfaces}; do
showstat=false
if [ -e /etc/start_if.${ifn} ]; then
. /etc/start_if.${ifn}

View File

@ -1,6 +1,6 @@
#!/bin/sh -
#
# $Id: rc.network,v 1.47 1999/06/08 13:00:30 brian Exp $
# $Id: rc.network,v 1.48 1999/07/07 12:49:45 peter Exp $
# From: @(#)netstart 5.9 (Berkeley) 3/30/91
# Note that almost all the user-configurable behavior is no longer in
@ -51,8 +51,10 @@ network_pass1() {
done
# Set up all the network interfaces, calling startup scripts if needed
interfaces="`ifconfig -l`"
for ifn in ${interfaces}; do
if [ "x${network_interfaces}" = "xauto" ]; then
network_interfaces="`ifconfig -l`"
fi
for ifn in ${network_interfaces}; do
showstat=false
if [ -e /etc/start_if.${ifn} ]; then
. /etc/start_if.${ifn}

View File

@ -1,6 +1,6 @@
#!/bin/sh -
#
# $Id: rc.network,v 1.47 1999/06/08 13:00:30 brian Exp $
# $Id: rc.network,v 1.48 1999/07/07 12:49:45 peter Exp $
# From: @(#)netstart 5.9 (Berkeley) 3/30/91
# Note that almost all the user-configurable behavior is no longer in
@ -51,8 +51,10 @@ network_pass1() {
done
# Set up all the network interfaces, calling startup scripts if needed
interfaces="`ifconfig -l`"
for ifn in ${interfaces}; do
if [ "x${network_interfaces}" = "xauto" ]; then
network_interfaces="`ifconfig -l`"
fi
for ifn in ${network_interfaces}; do
showstat=false
if [ -e /etc/start_if.${ifn} ]; then
. /etc/start_if.${ifn}

View File

@ -1,6 +1,6 @@
#!/bin/sh -
#
# $Id: rc.network,v 1.47 1999/06/08 13:00:30 brian Exp $
# $Id: rc.network,v 1.48 1999/07/07 12:49:45 peter Exp $
# From: @(#)netstart 5.9 (Berkeley) 3/30/91
# Note that almost all the user-configurable behavior is no longer in
@ -51,8 +51,10 @@ network_pass1() {
done
# Set up all the network interfaces, calling startup scripts if needed
interfaces="`ifconfig -l`"
for ifn in ${interfaces}; do
if [ "x${network_interfaces}" = "xauto" ]; then
network_interfaces="`ifconfig -l`"
fi
for ifn in ${network_interfaces}; do
showstat=false
if [ -e /etc/start_if.${ifn} ]; then
. /etc/start_if.${ifn}

View File

@ -1,6 +1,6 @@
#!/bin/sh -
#
# $Id: rc.network,v 1.47 1999/06/08 13:00:30 brian Exp $
# $Id: rc.network,v 1.48 1999/07/07 12:49:45 peter Exp $
# From: @(#)netstart 5.9 (Berkeley) 3/30/91
# Note that almost all the user-configurable behavior is no longer in
@ -51,8 +51,10 @@ network_pass1() {
done
# Set up all the network interfaces, calling startup scripts if needed
interfaces="`ifconfig -l`"
for ifn in ${interfaces}; do
if [ "x${network_interfaces}" = "xauto" ]; then
network_interfaces="`ifconfig -l`"
fi
for ifn in ${network_interfaces}; do
showstat=false
if [ -e /etc/start_if.${ifn} ]; then
. /etc/start_if.${ifn}

View File

@ -1,6 +1,6 @@
#!/bin/sh -
#
# $Id: rc.network,v 1.47 1999/06/08 13:00:30 brian Exp $
# $Id: rc.network,v 1.48 1999/07/07 12:49:45 peter Exp $
# From: @(#)netstart 5.9 (Berkeley) 3/30/91
# Note that almost all the user-configurable behavior is no longer in
@ -51,8 +51,10 @@ network_pass1() {
done
# Set up all the network interfaces, calling startup scripts if needed
interfaces="`ifconfig -l`"
for ifn in ${interfaces}; do
if [ "x${network_interfaces}" = "xauto" ]; then
network_interfaces="`ifconfig -l`"
fi
for ifn in ${network_interfaces}; do
showstat=false
if [ -e /etc/start_if.${ifn} ]; then
. /etc/start_if.${ifn}

View File

@ -1,6 +1,6 @@
#!/bin/sh -
#
# $Id: rc.network,v 1.47 1999/06/08 13:00:30 brian Exp $
# $Id: rc.network,v 1.48 1999/07/07 12:49:45 peter Exp $
# From: @(#)netstart 5.9 (Berkeley) 3/30/91
# Note that almost all the user-configurable behavior is no longer in
@ -51,8 +51,10 @@ network_pass1() {
done
# Set up all the network interfaces, calling startup scripts if needed
interfaces="`ifconfig -l`"
for ifn in ${interfaces}; do
if [ "x${network_interfaces}" = "xauto" ]; then
network_interfaces="`ifconfig -l`"
fi
for ifn in ${network_interfaces}; do
showstat=false
if [ -e /etc/start_if.${ifn} ]; then
. /etc/start_if.${ifn}