svn commit: r309972 - head/usr.sbin/bsdinstall/scripts

[Devin Teske]

Author: dteske
Date: Tue Dec 13 01:56:28 2016
New Revision: 309972
URL: https://svnweb.freebsd.org/changeset/base/309972

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

Modified:
  head/usr.sbin/bsdinstall/scripts/wlanconfig

Modified: head/usr.sbin/bsdinstall/scripts/wlanconfig
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/wlanconfig	Tue Dec 13 01:54:44 2016	(r309971)
+++ head/usr.sbin/bsdinstall/scripts/wlanconfig	Tue Dec 13 01:56:28 2016	(r309972)
@@ -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