Magellan Linux

Diff of /trunk/initscripts/sysvinit/rc/network

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 636 by niro, Thu Dec 13 12:06:22 2007 UTC revision 684 by niro, Thu Mar 20 12:43:14 2008 UTC
# Line 1  Line 1 
1  #!/bin/bash  #!/bin/bash
2  # $Header: /home/cvsd/magellan-cvs/magellan-src/magellan-initscripts/etc/rc.d/init.d/network,v 1.14 2007-12-13 12:06:22 niro Exp $  # $Header: /home/cvsd/magellan-cvs/magellan-src/magellan-initscripts/etc/rc.d/init.d/network,v 1.17 2008-03-20 12:43:14 niro Exp $
3    
4  #%rlevels: 0:k 1:k 2:k 3:s 4:s 5:s 6:k  #%rlevels: 0:k 1:k 2:k 3:s 4:s 5:s 6:k
5  #%start: 20  #%start: 20
# Line 277  config_bridge_devices() Line 277  config_bridge_devices()
277   fi   fi
278    
279   # check the config   # check the config
280   if [[ -z ${BRIDGE_INTERFACE} ]]   if [[ -z ${BRIDGE_INTERFACES} ]]
281   then   then
282   echo "BRIDGE: no \$BRIDGE_INTERFACE given. Aborting setup."   echo "BRIDGE: no \$BRIDGE_INTERFACES given. Aborting setup."
283   return 1   return 1
284   fi   fi
285    
# Line 295  config_bridge_devices() Line 295  config_bridge_devices()
295   brctl addif ${iface} ${bport}   brctl addif ${iface} ${bport}
296   done   done
297   # enable spanning-tree protocol   # enable spanning-tree protocol
298   case BRIDGE_STP in   case ${BRIDGE_STP} in
299   on|off) brctl stp ${iface} ${BRIDGE_STP} ;;   on|off) brctl stp ${iface} ${BRIDGE_STP} ;;
300   *) echo "BRIDGE: unkown value \$BRIDGE_STP='$BRIDGE_STP'."; return 1 ;;   *) echo "BRIDGE: unkown value \$BRIDGE_STP='$BRIDGE_STP'."; return 1 ;;
301   esac   esac
# Line 421  networking_start() Line 421  networking_start()
421   echo -e ${COLOREDSTAR}"Setting up default gateway for ${COLBLUE}${iface}${COLDEFAULT} ..."   echo -e ${COLOREDSTAR}"Setting up default gateway for ${COLBLUE}${iface}${COLDEFAULT} ..."
422   route add default gateway ${GATEWAY} metric 1 dev ${iface}   route add default gateway ${GATEWAY} metric 1 dev ${iface}
423   evaluate_retval   evaluate_retval
424    
425     unset GATEWAY
426   fi   fi
427    
428   # setup /etc/resolv.conf   # setup /etc/resolv.conf
# Line 434  networking_start() Line 436  networking_start()
436   do   do
437   echo "nameserver ${dns}" >> /etc/resolv.conf   echo "nameserver ${dns}" >> /etc/resolv.conf
438   done   done
439    
440     unset NAMESERVER
441   fi   fi
442   done   done
443    

Legend:
Removed from v.636  
changed lines
  Added in v.684