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 1665 by niro, Fri Jan 20 23:01:04 2012 UTC revision 2307 by niro, Thu Jan 2 13:33:22 2014 UTC
    # Line 14  source /etc/conf.d/rc Line 14  source /etc/conf.d/rc
    14  source ${rc_functions}  source ${rc_functions}
    15  source /etc/conf.d/network  source /etc/conf.d/network
    16    
    17    wait_online()
    18    {
    19     local timeout="1"
    20     local iface="$2"
    21    
    22     (( timeout *= 10 ))
    23    
    24     while [ ! -e /sys/class/net/${iface} ]
    25     do
    26     (( timeout-- > 0 )) || return 1
    27     sleep 0.1
    28     done
    29    
    30     return 0
    31    }
    32    
    33  # read values from files  # read values from files
    34  read_value()  read_value()
    35  {  {
    # Line 180  config_wireless_wpa() Line 196  config_wireless_wpa()
    196   return 1   return 1
    197   fi   fi
    198    
    199   if [ ! -x /sbin/wpa_supplicant ]   if [ ! -x $(type -P wpa_supplicant) ]
    200   then   then
    201   rc_echo "WPA: wpa_supplicant not installed. Aborting setup."   rc_echo "WPA: wpa_supplicant not installed. Aborting setup."
    202   return 1   return 1
    # Line 194  config_wireless_wpa() Line 210  config_wireless_wpa()
    210   [[ -f /etc/conf.d/wpa_supplicant ]] && source /etc/conf.d/wpa_supplicant   [[ -f /etc/conf.d/wpa_supplicant ]] && source /etc/conf.d/wpa_supplicant
    211    
    212   # check the configuration   # check the configuration
    213   [[ -z ${WIRELESS_WPA_CONFIG} ]] && WIRELESS_WPA_CONFIG=/etc/wpa_supplicant.auto   [[ -z ${WIRELESS_WPA_CONFIG} ]] && WIRELESS_WPA_CONFIG=/etc/wpa_supplicant/wpa_supplicant.auto
    214   [[ -z ${WIRELESS_WPA_SKEL} ]] && WIRELESS_WPA_SKEL=/etc/conf.d/wpa_supplicant.skel   [[ -z ${WIRELESS_WPA_SKEL} ]] && WIRELESS_WPA_SKEL=/etc/conf.d/wpa_supplicant.skel
    215    
    216   # use wext as default driver, do not abort here anymore   # use wext as default driver, do not abort here anymore
    # Line 356  config_bridge_devices() Line 372  config_bridge_devices()
    372   fi   fi
    373    
    374   # first check for brctl   # first check for brctl
    375   if [[ -z $(which brctl) ]]   if [[ -z $(type -P brctl) ]]
    376   then   then
    377   rc_echo "brctl not found! Please install 'net-misc/bridge-utils'."   rc_echo "brctl not found! Please install 'net-misc/bridge-utils'."
    378   return 1   return 1
    # Line 460  networking_start() Line 476  networking_start()
    476   source ${rc_network_settings}/net.${iface} || exit 1   source ${rc_network_settings}/net.${iface} || exit 1
    477   checkconfig   checkconfig
    478    
    479     # wait until the device is created
    480     wait_online 5 "${iface}" || { rc_echo "device '${iface}' does not exist"; continue; }
    481    
    482   # setup mac   # setup mac
    483   if [[ -n ${FORCE_MAC_TO} ]]   if [[ -n ${FORCE_MAC_TO} ]]
    484   then   then
    # Line 475  networking_start() Line 494  networking_start()
    494   fi   fi
    495    
    496   # now configure wireless_extensions   # now configure wireless_extensions
    497   [ -x /usr/sbin/iwconfig ] && setup_wireless_extensions "${iface}"   [ -x $(type -P iwconfig) ] && setup_wireless_extensions "${iface}"
    498    
    499   rc_print "Bringing up interface ${COLBLUE}${iface}${COLDEFAULT} ..."   rc_print "Bringing up interface ${COLBLUE}${iface}${COLDEFAULT} ..."
    500    
    # Line 515  networking_start() Line 534  networking_start()
    534   then   then
    535   rc_print "Setting up all nameserver for ${COLBLUE}${iface}${COLDEFAULT} ..."   rc_print "Setting up all nameserver for ${COLBLUE}${iface}${COLDEFAULT} ..."
    536    
    537   # whipe out the old one   # wipe out the old one
    538   echo "# Generated by the magellan-initscripts for ${iface}" > /etc/resolv.conf   echo "# Generated by the magellan-initscripts for ${iface}" > /etc/resolv.conf
    539   # include head   # include head
    540   if [ -f /etc/resolv.conf.head ]   if [ -f /etc/resolv.conf.head ]
    Legend:
    Removed from v.1665  
    changed lines
      Added in v.2307