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 2997 by niro, Thu Nov 26 14:14:05 2015 UTC revision 2998 by niro, Thu Oct 13 15:07:14 2016 UTC
    # Line 70  read_value() Line 70  read_value()
    70   local WIRELESS_CHANNEL   local WIRELESS_CHANNEL
    71   local WIRELESS_DEFAULT_KEY   local WIRELESS_DEFAULT_KEY
    72   local WIRELESS_ESSID   local WIRELESS_ESSID
    73     local WIRELESS_SCAN_HIDDEN_ESSID
    74   local WIRELESS_FREQUENCY   local WIRELESS_FREQUENCY
    75   local WIRELESS_KEY   local WIRELESS_KEY
    76   local WIRELESS_KEY_ASCII   local WIRELESS_KEY_ASCII
    # Line 213  config_wireless_wpa() Line 214  config_wireless_wpa()
    214   [[ -z ${WIRELESS_WPA_CONFIG} ]] && WIRELESS_WPA_CONFIG=/etc/wpa_supplicant/wpa_supplicant.auto   [[ -z ${WIRELESS_WPA_CONFIG} ]] && WIRELESS_WPA_CONFIG=/etc/wpa_supplicant/wpa_supplicant.auto
    215   [[ -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
    216    
    217   # use wext as default driver, do not abort here anymore   # use nl80211 as default driver, do not abort here anymore
    218   [[ -z ${WIRELESS_WPA_DRIVER} ]] && WIRELESS_WPA_DRIVER=wext   [[ -z ${WIRELESS_WPA_DRIVER} ]] && WIRELESS_WPA_DRIVER=nl80211
    219    
    220     # disable hidden ssid scan as default
    221     [[ -z ${WIRELESS_SCAN_HIDDEN_ESSID} ]] && WIRELESS_SCAN_HIDDEN_ESSID=0
    222    
    223   # write a config with the settings from net.${iface}   # write a config with the settings from net.${iface}
    224   # only wpa-psk ! all other needs manual setup   # only wpa-psk ! all other needs manual setup
    # Line 231  config_wireless_wpa() Line 235  config_wireless_wpa()
    235    
    236   # setup the network entry   # setup the network entry
    237   sed -i -e "s:@WIRELESS_ESSID@:${WIRELESS_ESSID}:g" \   sed -i -e "s:@WIRELESS_ESSID@:${WIRELESS_ESSID}:g" \
    238     -e "s:@WIRELESS_SCAN_HIDDEN_ESSID@:${WIRELESS_SCAN_HIDDEN_ESSID}:g" \
    239   -e "s:@WIRELESS_KEY@:${WIRELESS_KEY_ASCII}:g" \   -e "s:@WIRELESS_KEY@:${WIRELESS_KEY_ASCII}:g" \
    240   -e "s:@WIRELESS_AUTH_MODE@:${wpa_proto}:g" \   -e "s:@WIRELESS_AUTH_MODE@:${wpa_proto}:g" \
    241   ${WIRELESS_WPA_CONFIG}   ${WIRELESS_WPA_CONFIG}
    Legend:
    Removed from v.2997  
    changed lines
      Added in v.2998