From owner-svn-src-stable-11@freebsd.org Thu Dec 7 03:57:13 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1E402E9B27A; Thu, 7 Dec 2017 03:57:13 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D895474104; Thu, 7 Dec 2017 03:57:12 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vB73vCED087285; Thu, 7 Dec 2017 03:57:12 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB73vC3F087284; Thu, 7 Dec 2017 03:57:12 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201712070357.vB73vC3F087284@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Thu, 7 Dec 2017 03:57:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r326653 - stable/11/usr.sbin/bsdinstall/scripts X-SVN-Group: stable-11 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/11/usr.sbin/bsdinstall/scripts X-SVN-Commit-Revision: 326653 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2017 03:57:13 -0000 Author: emaste Date: Thu Dec 7 03:57:11 2017 New Revision: 326653 URL: https://svnweb.freebsd.org/changeset/base/326653 Log: MFC r326094: Fix indentation in bsdinstall-created wpa_supplicant.conf r311690 (MFC of r309934) cleaned up some cases in bsdinstall to use heredocs but broke the indentation of the generated output, because <<- heredocs strip leading tabs. PR: 221982 Modified: stable/11/usr.sbin/bsdinstall/scripts/wlanconfig Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/bsdinstall/scripts/wlanconfig ============================================================================== --- stable/11/usr.sbin/bsdinstall/scripts/wlanconfig Thu Dec 7 02:08:55 2017 (r326652) +++ stable/11/usr.sbin/bsdinstall/scripts/wlanconfig Thu Dec 7 03:57:11 2017 (r326653) @@ -280,14 +280,14 @@ if echo "$ENCRYPTION" | grep -q PSK; then 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD ) || exec "$0" "$@" awk 'sub(/^\t/,"")||1' \ - >> "$BSDINSTALL_TMPETC/wpa_supplicant.conf" <<-EOF - network={ - ssid="$NETWORK" - scan_ssid=$SCANSSID - psk="$PASS" - priority=5 - } - EOF + >> "$BSDINSTALL_TMPETC/wpa_supplicant.conf" <&1 >&$DIALOG_TERMINAL_PASSTHRU_FD ) || exec "$0" "$@" awk 'sub(/^\t/,"")||1' \ - >> "$BSDINSTALL_TMPETC/wpa_supplicant.conf" <<-EOF - network={ - ssid="$NETWORK" - scan_ssid=$SCANSSID - key_mgmt=WPA-EAP$( - echo "$USERPASS" | awk ' - NR == 1 { printf "\n\t\tidentity=\"%s\"", $1 } - NR == 2 { printf "\n\t\tpassword=\"%s\"", $1 } - ' ) - priority=5 - } - EOF + >> "$BSDINSTALL_TMPETC/wpa_supplicant.conf" <&1 >&$DIALOG_TERMINAL_PASSTHRU_FD ) || exec "$0" "$@" awk 'sub(/^\t/,"")||1' \ - >> "$BSDINSTALL_TMPETC/wpa_supplicant.conf" <<-EOF - network={ - ssid="$NETWORK" - scan_ssid=$SCANSSID - key_mgmt=NONE - wep_key0="$WEPKEY" - wep_tx_keyidx=0 - priority=5 - } - EOF + >> "$BSDINSTALL_TMPETC/wpa_supplicant.conf" <> "$BSDINSTALL_TMPETC/wpa_supplicant.conf" <<-EOF - network={ - ssid="$NETWORK" - scan_ssid=$SCANSSID - key_mgmt=NONE - priority=5 - } - EOF + >> "$BSDINSTALL_TMPETC/wpa_supplicant.conf" <