d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix indentation in bsdinstall-created wpa_supplicant.conf

Browse Source 
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
Reviewed by:	allanjude, dteske
MFC after:	2 weeks
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D13190
This commit is contained in:
Ed Maste 2017-11-22 15:18:11 +00:00
parent 7a5c730561
commit 850b25abab
1 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
usr.sbin/bsdinstall/scripts/wlanconfig
View File

@ -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" <<EOF
network={
ssid="$NETWORK"
scan_ssid=$SCANSSID
psk="$PASS"
priority=5
}
EOF
elif echo "$ENCRYPTION" | grep -q EAP; then
USERPASS=$( $DIALOG \
--title "WPA-Enterprise Setup" \
@ -301,18 +301,18 @@ elif echo "$ENCRYPTION" | grep -q EAP; 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
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" <<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
elif echo "$ENCRYPTION" | grep -q WEP; then
WEPKEY=$( $DIALOG \
--title "WEP Setup" \
@ -325,26 +325,26 @@ elif echo "$ENCRYPTION" | grep -q WEP; 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
key_mgmt=NONE
wep_key0="$WEPKEY"
wep_tx_keyidx=0
priority=5
}
EOF
>> "$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
else # Open
awk 'sub(/^\t/,"")||1' \
>> "$BSDINSTALL_TMPETC/wpa_supplicant.conf" <<-EOF
network={
ssid="$NETWORK"
scan_ssid=$SCANSSID
key_mgmt=NONE
priority=5
}
EOF
>> "$BSDINSTALL_TMPETC/wpa_supplicant.conf" <<EOF
network={
ssid="$NETWORK"
scan_ssid=$SCANSSID
key_mgmt=NONE
priority=5
}
EOF
fi
# Connect to any open networks policy