diff options
| author | Jouke Witteveen <j.witteveen@gmail.com> | 2012-03-27 17:24:56 +0200 |
|---|---|---|
| committer | Jouke Witteveen <j.witteveen@gmail.com> | 2012-03-27 17:24:56 +0200 |
| commit | 7223c92b843fc232ebe687cb806051ceab31bfff (patch) | |
| tree | 56665a4dda0e16d799cb0abd572c11400605cac4 /src | |
| parent | 7baf52dfc5e0e70cc8566d693d010465535b1886 (diff) | |
| download | netctl-7223c92b843fc232ebe687cb806051ceab31bfff.tar.gz netctl-7223c92b843fc232ebe687cb806051ceab31bfff.tar.xz | |
Remove more deprecated code
No need to keep support the "-old" syntax when it doesn't really do anything.
Diffstat (limited to 'src')
| -rw-r--r-- | src/8021x | 10 | ||||
| -rw-r--r-- | src/connections/wireless | 4 |
2 files changed, 5 insertions, 9 deletions
@@ -191,7 +191,7 @@ make_wpa_config_file() { # Requires already loaded profile make_wpa_config() { case $SECURITY in - wep|wep-old|wpa|none|none-old) + none|wep|wpa) case "${ESSID_TYPE:-ascii}" in ascii) echo "ssid=\"$ESSID\"" @@ -220,7 +220,10 @@ make_wpa_config() { # Key management case $SECURITY in - wep|wep-old) + none) + echo "key_mgmt=NONE" + ;; + wep) echo "key_mgmt=NONE" echo "wep_tx_keyidx=0" if [[ ${KEY:0:2} == "s:" ]]; then # TODO: does wpa_supplicant handle this as expected? @@ -229,9 +232,6 @@ make_wpa_config() { echo "wep_key0=$KEY" fi ;; - none|none-old) - echo "key_mgmt=NONE" - ;; wpa) echo "proto=RSN WPA" if [[ "${#KEY}" -eq 64 ]]; then diff --git a/src/connections/wireless b/src/connections/wireless index 7abb180..a5b7ad2 100644 --- a/src/connections/wireless +++ b/src/connections/wireless @@ -10,10 +10,6 @@ wireless_up() { # Default settings SECURITY=${SECURITY:-none} - if [[ "$SECURITY" != "${SECURITY%-old}" ]]; then - report_warn "SECURITY=none-old, wep-old are deprecated, please use none, wep instead!" - SECURITY=${SECURITY%-old} - fi WPA_DRIVER=${WPA_DRIVER:-nl80211,wext} enable_rf $INTERFACE $RFKILL $RFKILL_NAME || return 1 |