diff --git a/etc/netstart b/etc/netstart index 122bb31e89fd..6a3f28962b26 100755 --- a/etc/netstart +++ b/etc/netstart @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: netstart,v 1.36 1995/12/28 01:24:03 jkh Exp $ +# $Id: netstart,v 1.37 1996/01/02 19:47:05 pst Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -59,14 +59,8 @@ if [ "x$gateway" != "xNO" ]; then sysctl -w net.inet.ip.forwarding=1 >/dev/null 2>&1 fi -if [ "x$routedflags" != "xNO" ] ; then +if [ "x$router" != "xNO" ] ; then echo -n starting routing daemon: - - # $routedflags is imported from /etc/sysconfig. - # If $routedflags == NO, routed isn't run. - - if [ "X${routedflags}" != X"NO" ]; then - echo -n ' routed'; routed $routedflags - fi + echo -n ' ${router}'; ${router} ${routerflags} echo '.' fi diff --git a/etc/sysconfig b/etc/sysconfig index bdb750a522bf..2bcffa6c641b 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.29 1995/12/28 01:24:04 jkh Exp $ +# $Id: sysconfig,v 1.30 1996/01/05 17:00:27 bde Exp $ ######################### Start Of Local Configuration Section ########### @@ -104,8 +104,13 @@ route_loopback="${hostname} localhost" # Set to the host you'd like set as your default router, or NO for none. defaultrouter=NO +# This is the routing daemon you want to use. Possible options are +# currently NO (for none), `routed' and `gated'. Also see `routerflags' +# for startup flags. +router=routed + # These are the flags you'd like to start the routing daemon with -routedflags=-q +routerflags=-q # timed flags, or NO if you don't want to start the time daemon timedflags=NO