svn commit: r309969 - head/usr.sbin/bsdinstall/scripts
Devin Teske
dteske at FreeBSD.org
Tue Dec 13 01:50:23 UTC 2016
Author: dteske
Date: Tue Dec 13 01:50:22 2016
New Revision: 309969
URL: https://svnweb.freebsd.org/changeset/base/309969
Log:
Why repeat yourself when you can send stderr to the same place as stdout?
Modified:
head/usr.sbin/bsdinstall/scripts/wlanconfig
Modified: head/usr.sbin/bsdinstall/scripts/wlanconfig
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/wlanconfig Tue Dec 13 01:44:18 2016 (r309968)
+++ head/usr.sbin/bsdinstall/scripts/wlanconfig Tue Dec 13 01:50:22 2016 (r309969)
@@ -165,13 +165,13 @@ EOF
# Try to reach wpa_supplicant. If it isn't running and we can modify the
# existing system, start it. Otherwise, fail.
#
-(wpa_cli ping >/dev/null 2>/dev/null || ([ "$BSDINSTALL_CONFIGCURRENT" ] &&
+(wpa_cli ping > /dev/null 2>&1 || ([ "$BSDINSTALL_CONFIGCURRENT" ] &&
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
# See if we succeeded
-wpa_cli ping >/dev/null 2>/dev/null
+wpa_cli ping > /dev/null 2>&1
if [ $? -ne 0 -a ! "$BSDINSTALL_CONFIGCURRENT" ]; then
$DIALOG \
--title "$msg_error" \
More information about the svn-src-head
mailing list