diff options
author | Rémy Oudompheng <remy@archlinux.org> | 2011-08-13 19:53:24 +0200 |
---|---|---|
committer | Rémy Oudompheng <remy@archlinux.org> | 2011-08-13 19:53:24 +0200 |
commit | f670917e974265c4559be7a62b9b95c07ec954d3 (patch) | |
tree | 225f592efc1fea7c3273d6258c3d0c8c2c7557e2 | |
parent | a285ed2891721a4217460b230fcb2cf067103d8b (diff) | |
download | netctl-f670917e974265c4559be7a62b9b95c07ec954d3.tar.gz netctl-f670917e974265c4559be7a62b9b95c07ec954d3.tar.xz |
netcfg-wpa_actiond: don't try to disable HW rfkills (FS#25514)
Signed-off-by: Rémy Oudompheng <remy@archlinux.org>
-rw-r--r-- | NEWS | 5 | ||||
-rwxr-xr-x | wpa_actiond/netcfg-wpa_actiond | 3 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,8 @@ +version 2.6.8 +- fix broken 802.11 in non-wireless setups (FS#25473) +- fix rfkill errors in net-auto-wireless (FS#25514) +- fix error message about non-existing net.ipv6.conf... (FS#25530) + version 2.6.7 - fix wrong quoting of $profile (FS#25362) - fix wrong parsing of wpa_supplicant configuration (FS#25464) diff --git a/wpa_actiond/netcfg-wpa_actiond b/wpa_actiond/netcfg-wpa_actiond index 9ad319f..bb144c3 100755 --- a/wpa_actiond/netcfg-wpa_actiond +++ b/wpa_actiond/netcfg-wpa_actiond @@ -21,7 +21,8 @@ case $1 in netcfg -i "$interface" stop_wpa "$interface" kill $(cat "/run/wpa_actiond_${2}.pid") - if [[ -n "$RFKILL" ]]; then + # only try to disable software rfkill switches (FS#25514) + if [[ "$RFKILL" == "soft" ]]; then set_rf_state "$interface" disabled $RFKILL_NAME || exit $? fi exit |