Tweak previous commit. Only sense the configuration if network_interfaces

is set to "auto".  Any network_interfaces settings will be treated as
before.

5 files changed, 25 insertions, 15 deletions

diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions
index 5f49696..63b8a32 100644
--- a/etc/rc.d/netoptions
+++ b/etc/rc.d/netoptions
@@ -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}
diff --git a/etc/rc.d/network1 b/etc/rc.d/network1
index 5f49696..63b8a32 100644
--- a/etc/rc.d/network1
+++ b/etc/rc.d/network1
@@ -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}
diff --git a/etc/rc.d/network2 b/etc/rc.d/network2
index 5f49696..63b8a32 100644
--- a/etc/rc.d/network2
+++ b/etc/rc.d/network2
@@ -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}
diff --git a/etc/rc.d/network3 b/etc/rc.d/network3
index 5f49696..63b8a32 100644
--- a/etc/rc.d/network3
+++ b/etc/rc.d/network3
@@ -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}
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index 5f49696..63b8a32 100644
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -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}