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 867 by niro, Sat May 9 16:08:38 2009 UTC revision 872 by niro, Thu May 21 13:41:38 2009 UTC
    # Line 182  config_wireless_wpa() Line 182  config_wireless_wpa()
    182   # check the configuration   # check the configuration
    183   [[ -z ${WIRELESS_WPA_CONFIG} ]] && WIRELESS_WPA_CONFIG=/etc/wpa_supplicant.auto   [[ -z ${WIRELESS_WPA_CONFIG} ]] && WIRELESS_WPA_CONFIG=/etc/wpa_supplicant.auto
    184   [[ -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
    185   if [[ -z ${WIRELESS_WPA_DRIVER} ]]  
    186   then   # use wext as default driver, do not abort here anymore
    187   echo "WPA: WIRELESS_WPA_DRIVER given. Aborting setup."   [[ -z ${WIRELESS_WPA_DRIVER} ]] && WIRELESS_WPA_DRIVER=wext
      return 1  
      fi  
    188    
    189   # write a config with the settings from net.${iface}   # write a config with the settings from net.${iface}
    190   # only wpa-psk ! all other needs manual setup   # only wpa-psk ! all other needs manual setup
    # Line 397  networking_start() Line 395  networking_start()
    395   config_bridge_devices ${iface} add   config_bridge_devices ${iface} add
    396   fi   fi
    397    
      # activate the interface  
      ifconfig "${iface}" up  
       
    398   # now configure wireless_extensions   # now configure wireless_extensions
    399   [ -x /usr/sbin/iwconfig ] && setup_wireless_extensions "${iface}"   [ -x /usr/sbin/iwconfig ] && setup_wireless_extensions "${iface}"
    400    
    401   echo -e ${COLOREDSTAR}"Bringing up interface ${COLBLUE}${iface}${COLDEFAULT} ..."   echo -e ${COLOREDSTAR}"Bringing up interface ${COLBLUE}${iface}${COLDEFAULT} ..."
    402    
    403     # activate the interface
    404     ifconfig "${iface}" up
    405    
    406   # setup static or dhcp   # setup static or dhcp
    407   case ${NETWORKING} in   case ${NETWORKING} in
    408   dhcp|DHCP)   dhcp|DHCP)
    Legend:
    Removed from v.867  
    changed lines
      Added in v.872