/[baselayout]/trunk/net-scripts/net.modules.d/wpa_supplicant
Gentoo

Diff of /trunk/net-scripts/net.modules.d/wpa_supplicant

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1752 Revision 1753
163 (( i++ )) 163 (( i++ ))
164 [[ ${i} == "${timeout}" || ${i} -gt "${timeout}" ]] && break 164 [[ ${i} == "${timeout}" || ${i} -gt "${timeout}" ]] && break
165 done 165 done
166 166
167 # Spit out an appropriate error 167 # Spit out an appropriate error
168 if [[ ${background} != "yes" ]]; then
169 if ${action} ; then 168 if ${action} ; then
170 eend 1 "Failed to configure ${iface} in the background" 169 eend 1 "Failed to configure ${iface} in the background"
171 else 170 else
172 eend 1 "Timed out" 171 eend 1 "Timed out"
173 fi
174 fi 172 fi
175 173
176 # exit without error with wpa_supplicant-0.4.x as we may get kickstarted 174 # exit without error with wpa_supplicant-0.4.x as we may get kickstarted
177 # when an AP comes in range 175 # when an AP comes in range
178 ${action} && exit 0 176 ${action} && exit 0
278 # The downside of this is that we don't see the interface being configured 276 # The downside of this is that we don't see the interface being configured
279 # for DHCP/static. 277 # for DHCP/static.
280 if [[ ${version} -gt 399 && -x ${actfile} ]]; then 278 if [[ ${version} -gt 399 && -x ${actfile} ]]; then
281 opts="${opts} -W -P/var/run/wpa_supplicant-${iface}.pid" 279 opts="${opts} -W -P/var/run/wpa_supplicant-${iface}.pid"
282 action=true 280 action=true
283 [[ ${RC_PARALLEL_STARTUP} == "yes" ]] && background=no
284 fi 281 fi
285 282
286 eval start-stop-daemon --start --exec /sbin/wpa_supplicant \ 283 eval start-stop-daemon --start --exec /sbin/wpa_supplicant \
287 --pidfile "/var/run/wpa_supplicant-${iface}.pid" \ 284 --pidfile "/var/run/wpa_supplicant-${iface}.pid" \
288 -- "${opts}" -B -i"${iface}" 285 -- "${opts}" -B -i"${iface}"
298 -- -a"${actfile}" -i"${iface}" \ 295 -- -a"${actfile}" -i"${iface}" \
299 -P"/var/run/wpa_cli-${iface}.pid" -B 296 -P"/var/run/wpa_cli-${iface}.pid" -B
300 eend "$?" || return 1 297 eend "$?" || return 1
301 fi 298 fi
302 299
303 # Background wpa_supplication if required
304 if [[ ${background} == "yes" ]]; then
305 if ! ${action} ; then
306 wpa_supplicant_associate "${iface}" \
307 && export IN_BACKGROUND=true \
308 && /etc/init.d/net.${iface} start >/dev/null &
309 fi
310 go_background
311 fi
312
313 eindent 300 eindent
314 veinfo "Waiting for association" 301 veinfo "Waiting for association"
315 eend 0 302 eend 0
316 303
317 wpa_supplicant_associate "${iface}" || return 1 304 wpa_supplicant_associate "${iface}" || return 1

Legend:
Removed from v.1752  
changed lines
  Added in v.1753

  ViewVC Help
Powered by ViewVC 1.1.20