Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/initscripts/sysvinit/rc/network

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

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

    revision 955 by niro, Sun Dec 27 02:49:25 2009 UTC revision 1091 by niro, Wed Jul 14 07:29:53 2010 UTC
    # Line 364  networking_start() Line 364  networking_start()
    364    
    365   if [[ -z $1 ]]   if [[ -z $1 ]]
    366   then   then
    367   ALL_INTERFACES=$(onboot_interface_list ${network_settings}/net.*)   ALL_INTERFACES=$(onboot_interface_list ${rc_network_settings}/net.*)
    368   else   else
    369   if [[ -e ${network_settings}/net.$1 ]]   if [[ -e ${rc_network_settings}/net.$1 ]]
    370   then   then
    371   ALL_INTERFACES="$1"   ALL_INTERFACES="$1"
    372   else   else
    # Line 381  networking_start() Line 381  networking_start()
    381   for iface in ${ALL_INTERFACES}   for iface in ${ALL_INTERFACES}
    382   do   do
    383   # checkconfig   # checkconfig
    384   source ${network_settings}/net.${iface} || exit 1   source ${rc_network_settings}/net.${iface} || exit 1
    385   checkconfig   checkconfig
    386    
    387   # setup mac   # setup mac
    # Line 434  networking_start() Line 434  networking_start()
    434   fi   fi
    435    
    436   # setup /etc/resolv.conf   # setup /etc/resolv.conf
    437     # whipe out the old one
    438     echo "# Generated by the magellan-initscripts for ${iface}" > /etc/resolv.conf
    439     # include head
    440     if [ -f /etc/resolv.conf.head ]
    441     then
    442     cat /etc/resolv.conf.head >> /etc/resolv.conf
    443     else
    444     echo "# /etc/resolv.conf.head can replace this line" >> /etc/resolv.conf
    445     fi
    446     # add given nameserver
    447   if [[ -n ${NAMESERVER} ]]   if [[ -n ${NAMESERVER} ]]
    448   then   then
    449   echo -e ${COLOREDSTAR}"Setting up all nameserver for ${COLBLUE}${iface}${COLDEFAULT} ..."   echo -e ${COLOREDSTAR}"Setting up all nameserver for ${COLBLUE}${iface}${COLDEFAULT} ..."
    450    
      # whipe out the old one  
      echo "# Generated by the magellan-initscripts for ${iface}" > /etc/resolv.conf  
    451   for dns in ${NAMESERVER}   for dns in ${NAMESERVER}
    452   do   do
    453   echo "nameserver ${dns}" >> /etc/resolv.conf   echo "nameserver ${dns}" >> /etc/resolv.conf
    # Line 447  networking_start() Line 455  networking_start()
    455    
    456   unset NAMESERVER   unset NAMESERVER
    457   fi   fi
    458     # include tail
    459     if [ -f /etc/resolv.conf.tail ]
    460     then
    461     cat /etc/resolv.conf.tail >> /etc/resolv.conf
    462     else
    463     echo "# /etc/resolv.conf.tail can replace this line" >> /etc/resolv.conf
    464     fi
    465   done   done
    466    
    467   # setup user routes   # setup user routes
    # Line 457  networking_stop() Line 472  networking_stop()
    472  {  {
    473   if [[ -z $1 ]]   if [[ -z $1 ]]
    474   then   then
    475   ALL_INTERFACES=$(onboot_interface_list ${network_settings}/net.*)   ALL_INTERFACES=$(onboot_interface_list ${rc_network_settings}/net.*)
    476   else   else
    477   if [[ -e ${network_settings}/net.$1 ]]   if [[ -e ${rc_network_settings}/net.$1 ]]
    478   then   then
    479   ALL_INTERFACES="$1"   ALL_INTERFACES="$1"
    480   else   else
    # Line 473  networking_stop() Line 488  networking_stop()
    488   # get list of all devices   # get list of all devices
    489   for iface in ${ALL_INTERFACES}   for iface in ${ALL_INTERFACES}
    490   do   do
    491   source ${network_settings}/net.${iface} || exit 1   source ${rc_network_settings}/net.${iface} || exit 1
    492   checkconfig   checkconfig
    493    
    494   if [[ -n ${GATEWAY} ]]   if [[ -n ${GATEWAY} ]]
    Legend:
    Removed from v.955  
    changed lines
      Added in v.1091