diff options
Diffstat (limited to 'src/connections/wireless')
| -rw-r--r-- | src/connections/wireless | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/connections/wireless b/src/connections/wireless index 98320fa..d9b457a 100644 --- a/src/connections/wireless +++ b/src/connections/wireless @@ -117,8 +117,13 @@ wireless_up() { # Connect! [[ -z "$WPA_OPTS" ]] && WPA_OPTS="-Dwext" +<<<<<<< Updated upstream report_debug wireless_up start_wpa "$INTERFACE" "$WPA_CONF" "$WPA_OPTS" if ! start_wpa $INTERFACE $WPA_CONF $WPA_OPTS; then +======= + report_debug wireless_up start_wpa "$INTERFACE" "$WPA_CONF/wpa.conf" "$WPA_OPTS" + if ! start_wpa "$INTERFACE" "$WPA_CONF" "$WPA_OPTS"; then +>>>>>>> Stashed changes report_fail "wpa_supplicant did not start, possible configuration error" return 1 fi |