From 3a3db1e368443447d7eaec461110bb122d026d83 Mon Sep 17 00:00:00 2001 From: Judd Vinet Date: Fri, 19 Apr 2002 17:13:21 +0000 Subject: Cleaned up networking in initscripts --- network | 32 ++++++++++++++++++++------------ rc.conf | 33 ++++++++++++++++++++++----------- 2 files changed, 42 insertions(+), 23 deletions(-) diff --git a/network b/network index 64a23c0..c316e70 100755 --- a/network +++ b/network @@ -7,28 +7,36 @@ case "$1" in start) stat_busy "Starting Network" - for ifline in "${IF_UP[@]}"; do - if [[ `echo $ifline | grep '^[^\!]' | wc -l` -eq 1 ]]; then - /sbin/ifconfig $ifline || stat_die + for ifline in ${INTERFACES[@]}; do + if echo $ifline | grep '^[^\!]' 2>&1 > /dev/null; then + varname="\$${ifline}" + eval new_ifline=$varname + /sbin/ifconfig $new_ifline || stat_die fi done - for rtline in "${ROUTE_UP[@]}"; do - if [[ `echo $rtline | grep '^[^\!]' | wc -l` -eq 1 ]]; then - /sbin/route $rtline || stat_die + for rtline in "${ROUTES[@]}"; do + if echo $rtline | grep '^[^\!]' 2>&1 > /dev/null; then + varname="\$${rtline}" + eval new_rtline=$varname + /sbin/route add $new_rtline || stat_die fi done stat_done ;; stop) stat_busy "Stopping Network" - for rtline in "${ROUTE_DN[@]}"; do - if [[ `echo $rtline | grep '^[^\!]' | wc -l` -eq 1 ]]; then - /sbin/route $rtline || stat_die + for rtline in "${ROUTES[@]}"; do + if echo $rtline | grep '^[^\!]' 2>&1 > /dev/null; then + varname="\$${rtline}" + eval new_rtline=$varname + /sbin/route del $new_rtline || stat_die fi done - for ifline in "${IF_DN[@]}"; do - if [[ `echo $ifline | grep '^[^\!]' | wc -l` -eq 1 ]]; then - /sbin/ifconfig $ifline || stat_die + for ifline in ${INTERFACES[@]}; do + if echo $ifline | grep '^[^\!]' 2>&1 > /dev/null; then + varname="\$${ifline}" + eval new_ifline=$varname + /sbin/ifconfig $new_ifline down || stat_die fi done stat_done diff --git a/rc.conf b/rc.conf index 9aaab14..f29f7c2 100644 --- a/rc.conf +++ b/rc.conf @@ -6,20 +6,29 @@ # Localization # KEYMAP=us -TIMEZONE=Canada/Pacific +TIMEZONE=America/New_York # # Networking # HOSTNAME="myhost" -IF_UP=( "lo 127.0.0.1" - "eth0 192.168.0.2 netmask 255.255.255.0 broadcast 192.168.0.255" -) -IF_DN=("lo down" - "eth0 down" -) -ROUTE_UP=("add default gw 192.168.0.1") -ROUTE_DN=("del default gw 192.168.0.1") + +# +# Interfaces to start at boot-up (in this order) +# Declare each interface then list in INTERFACES +# (prefix an interface in INTERFACES with a ! to disable it) +# +lo="lo 127.0.0.1" +eth0="eth0 192.168.0.2 netmask 255.255.255.0 broadcast 192.168.0.255" +INTERFACES=(lo eth0) + +# +# Routes to start at boot-up (in this order) +# Declare each route then list in ROUTES +# (prefix a route in ROUTES with a ! to disable it) +# +gateway="default gw 192.168.0.1" +ROUTES=(gateway) # # Daemons to start at boot-up (in this order) @@ -28,9 +37,11 @@ ROUTE_DN=("del default gw 192.168.0.1") DAEMONS=(!pcmcia network crond inetd) # -# profile scripts in /etc/profile.d to enable +# Profiles to start when a user first logs in (in this order) +# (prefix a profile with a ! to disable it) +# (profiles are found in /etc/profile.d) # -PROFILES=() +PROFILES=(!postgresql.sh qt.sh kde.sh) # # PCMCIA -- cgit v1.2.3