From: dteske <dteske@FreeBSD.org>
Date: Tue, 13 Dec 2016 01:56:28 +0000 (+0000)
Subject: If the first ping succeeded, why on Earth should we ping it again?
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=466c31033e4c688a25e1812b9865a8ebd53a295b;p=people%2Froyger%2Ffreebsd.git

If the first ping succeeded, why on Earth should we ping it again?
---

diff --git a/usr.sbin/bsdinstall/scripts/wlanconfig b/usr.sbin/bsdinstall/scripts/wlanconfig
index 834090e0db3a..32b83299ebf9 100755
--- a/usr.sbin/bsdinstall/scripts/wlanconfig
+++ b/usr.sbin/bsdinstall/scripts/wlanconfig
@@ -170,19 +170,19 @@ if ! wpa_cli ping > /dev/null 2>&1; then
 		wpa_supplicant -B -i $1 -c "$BSDINSTALL_TMPETC/wpa_supplicant.conf") ||
 		$DIALOG --backtitle "$DIALOG_BACKTITLE" --title "$msg_error" --msgbox \
 		"Could not start wpa_supplicant!" 0 0; exit 1 || exit 1
-fi
 
-# See if we succeeded
-wpa_cli ping > /dev/null 2>&1
-if [ $? -ne 0 -a ! "$BSDINSTALL_CONFIGCURRENT" ]; then
-	$DIALOG \
-		--title "$msg_error" \
-		--backtitle "$DIALOG_BACKTITLE" \
-		--msgbox "Wireless cannot be configured without making changes to the local system!" \
-		0 0
-	exit 1
+	wpa_cli ping > /dev/null 2>&1
+	if [ $? -ne 0 -a ! "$BSDINSTALL_CONFIGCURRENT" ]; then
+		$DIALOG \
+			--title "$msg_error" \
+			--backtitle "$DIALOG_BACKTITLE" \
+			--msgbox "Wireless cannot be configured without making changes to the local system!" \
+			0 0
+		exit 1
+	fi
 fi
 
+
 #
 # There is no way to check country/regdomain without (possible)
 # interface state modification