From a4c758d85cd8995aaeb0f9cfce3f293fe03d3f86 Mon Sep 17 00:00:00 2001
From: jkh <jkh@FreeBSD.org>
Date: Fri, 9 Feb 1996 12:45:38 +0000
Subject: Close conf/1007 and take this opportunity to correct a few
 long-standing bogons with the way static_routes was being handled.  Also
 document the fact that default_router overrides static_routes entirely.

---
 etc/netstart  | 12 +++++++-----
 etc/sysconfig | 13 ++++++++-----
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/etc/netstart b/etc/netstart
index 49c3523..b0a4a5a 100755
--- a/etc/netstart
+++ b/etc/netstart
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: netstart,v 1.39 1996/01/08 04:50:18 jkh Exp $
+#	$Id: netstart,v 1.40 1996/01/31 15:02:24 mpp Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -49,10 +49,12 @@ if [ -n "$defaultrouter" -a "x$defaultrouter" != "xNO" ] ; then
 fi
 
 # Set up any static routes.  This should be done before router discovery.
-for i in ${static_routes}; do
-	eval route_args=\$route_${i}
-	route add ${route_args}
-done
+if [ "x${static_routes}" != "xNO" ]; then
+	for i in ${static_routes}; do
+		eval route_args=\$route_${i}
+		route add ${route_args}
+	done
+fi
 
 if [ "x$gateway" != "xNO" ]; then
 	echo 'configuring host as a gateway.'
diff --git a/etc/sysconfig b/etc/sysconfig
index a204117..33c5d90 100644
--- a/etc/sysconfig
+++ b/etc/sysconfig
@@ -4,7 +4,7 @@
 # This is sysconfig - a file full of useful variables that you can set 
 # to change the default startup behavior of your system.
 #
-#	$Id: sysconfig,v 1.34 1996/01/31 15:02:32 mpp Exp $
+#	$Id: sysconfig,v 1.35 1996/02/09 12:20:40 jkh Exp $
 
 ######################### Start Of Local Configuration Section ###########
 
@@ -95,13 +95,16 @@ ifconfig_lo0="inet localhost"
 
 #
 # Set to the list of route add lines for this host.  You must have a
-# route_${static_routes} line for each static route listed here.
+# route_${static_routes} line for each static route listed here (unless
+# static_routes is set to NO).
 #
-static_routes="multicast loopback"
-route_multicast="224.0.0.0 -netmask 0xf0000000 -interface ${hostname}"
-route_loopback="${hostname} localhost"
+#static_routes="foo multicast"
+#route_foo="woofo woofo-gw"
+#route_multicast="224.0.0.0 -netmask 0xf0000000 -interface 10.0.0.1"
+static_routes=NO
 
 # Set to the host you'd like set as your default router, or NO for none.
+# Note:  If set, this option *overrides* the static_routes variable.
 defaultrouter=NO
 
 # This is the routing daemon you want to use.  Possible options are
-- 
cgit v1.1