Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/initscripts/systemd/units/scripts/network.sh

    Diff of /trunk/initscripts/systemd/units/scripts/network.sh

    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 167  config_wireless_wpa() Line 167  config_wireless_wpa()
    167   return 1   return 1
    168   fi   fi
    169    
    170   if [ ! -x /sbin/wpa_supplicant ]   if [ ! -x $(type -P wpa_supplicant) ]
    171   then   then
    172   echo "WPA: wpa_supplicant not installed. Aborting setup."   echo "WPA: wpa_supplicant not installed. Aborting setup."
    173   return 1   return 1
    # Line 177  config_wireless_wpa() Line 177  config_wireless_wpa()
    177   [[ -f /etc/conf.d/wpa_supplicant ]] && source /etc/conf.d/wpa_supplicant   [[ -f /etc/conf.d/wpa_supplicant ]] && source /etc/conf.d/wpa_supplicant
    178    
    179   # check the configuration   # check the configuration
    180   [[ -z ${WIRELESS_WPA_CONFIG} ]] && WIRELESS_WPA_CONFIG=/etc/wpa_supplicant.auto   [[ -z ${WIRELESS_WPA_CONFIG} ]] && WIRELESS_WPA_CONFIG=/etc/wpa_supplicant/wpa_supplicant.auto
    181   [[ -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
    182    
    183   # use wext as default driver, do not abort here anymore   # use wext as default driver, do not abort here anymore
    # Line 328  config_bridge_devices() Line 328  config_bridge_devices()
    328   fi   fi
    329    
    330   # first check for brctl   # first check for brctl
    331   if [[ -z $(which brctl) ]]   if [[ -z $(type -P brctl) ]]
    332   then   then
    333   echo "brctl not found! Please install 'net-misc/bridge-utils'."   echo "brctl not found! Please install 'net-misc/bridge-utils'."
    334   return 1   return 1
    # Line 441  networking_start() Line 441  networking_start()
    441   fi   fi
    442    
    443   # now configure wireless_extensions   # now configure wireless_extensions
    444   [ -x /usr/sbin/iwconfig ] && setup_wireless_extensions "${iface}"   [ -x $(type -P iwconfig) ] && setup_wireless_extensions "${iface}"
    445    
    446   # activate the interface   # activate the interface
    447   ifconfig "${iface}" up   ifconfig "${iface}" up
    Legend:
    Removed from v.1665  
    changed lines
      Added in v.2101