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 2101 by niro, Tue Apr 2 08:27:01 2013 UTC
    # Line 180  config_wireless_wpa() Line 180  config_wireless_wpa()
    180   return 1   return 1
    181   fi   fi
    182    
    183   if [ ! -x /sbin/wpa_supplicant ]   if [ ! -x $(type -P wpa_supplicant) ]
    184   then   then
    185   rc_echo "WPA: wpa_supplicant not installed. Aborting setup."   rc_echo "WPA: wpa_supplicant not installed. Aborting setup."
    186   return 1   return 1
    # Line 194  config_wireless_wpa() Line 194  config_wireless_wpa()
    194   [[ -f /etc/conf.d/wpa_supplicant ]] && source /etc/conf.d/wpa_supplicant   [[ -f /etc/conf.d/wpa_supplicant ]] && source /etc/conf.d/wpa_supplicant
    195    
    196   # check the configuration   # check the configuration
    197   [[ -z ${WIRELESS_WPA_CONFIG} ]] && WIRELESS_WPA_CONFIG=/etc/wpa_supplicant.auto   [[ -z ${WIRELESS_WPA_CONFIG} ]] && WIRELESS_WPA_CONFIG=/etc/wpa_supplicant/wpa_supplicant.auto
    198   [[ -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
    199    
    200   # 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 356  config_bridge_devices()
    356   fi   fi
    357    
    358   # first check for brctl   # first check for brctl
    359   if [[ -z $(which brctl) ]]   if [[ -z $(type -P brctl) ]]
    360   then   then
    361   rc_echo "brctl not found! Please install 'net-misc/bridge-utils'."   rc_echo "brctl not found! Please install 'net-misc/bridge-utils'."
    362   return 1   return 1
    # Line 475  networking_start() Line 475  networking_start()
    475   fi   fi
    476    
    477   # now configure wireless_extensions   # now configure wireless_extensions
    478   [ -x /usr/sbin/iwconfig ] && setup_wireless_extensions "${iface}"   [ -x $(type -P iwconfig) ] && setup_wireless_extensions "${iface}"
    479    
    480   rc_print "Bringing up interface ${COLBLUE}${iface}${COLDEFAULT} ..."   rc_print "Bringing up interface ${COLBLUE}${iface}${COLDEFAULT} ..."
    481    
    Legend:
    Removed from v.1665  
    changed lines
      Added in v.2101