diff options
| author | Roy Marples <roy@marples.name> | 2007-12-10 16:25:29 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2007-12-10 16:25:29 +0000 |
| commit | 7a18054fbed634616c925135b03536f1b9492e6e (patch) | |
| tree | 33d0f113197f361e463f54164cb8a752a59fca6e /net | |
| parent | 159fc8b4adf4afa56bd6e0483817903923f6a64e (diff) | |
| download | openrc-7a18054fbed634616c925135b03536f1b9492e6e.tar.gz openrc-7a18054fbed634616c925135b03536f1b9492e6e.tar.bz2 openrc-7a18054fbed634616c925135b03536f1b9492e6e.tar.xz | |
Only configure SSID if we are running on a wireless interface.
Diffstat (limited to 'net')
| -rw-r--r-- | net/wpa_supplicant.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/wpa_supplicant.sh b/net/wpa_supplicant.sh index e235573..7daa2c5 100644 --- a/net/wpa_supplicant.sh +++ b/net/wpa_supplicant.sh @@ -63,7 +63,7 @@ _get_ap_mac_address() { fi wpa_supplicant_pre_start() { - local opts= cfgfile= ctrl_dir= + local opts= cfgfile= ctrl_dir= wireless=true local wpas=/usr/sbin/wpa_supplicant wpac=/usr/bin/wpa_cli if [ ! -x "${wpas}" ]; then @@ -74,14 +74,14 @@ wpa_supplicant_pre_start() { eval opts=\$wpa_supplicant_${IFVAR} case " ${opts} " in - *" -Dwired "*);; + *" -Dwired "*) wireless=false;; *) _is_wireless || return 0;; esac # We don't configure wireless if we're being called from # the background unless we're not currently running if yesno ${IN_BACKGROUND}; then - if service_started_daemon "${SVCNAME}" "${wpas}"; then + if ${wireless} && service_started_daemon "${SVCNAME}" "${wpas}"; then SSID=$(_get_ssid "${IFACE}") SSIDVAR=$(_shell_var "${SSID}") save_options "SSID" "${SSID}" |