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 
PR:		base/221982
Reported by:	emaste
Reviewed by:	emaste, allanjude
MFC after:	0 days
X-MFC-to:	stable/11
Differential Revision:	https://reviews.freebsd.org/D23641
This commit is contained in:
Devin Teske 2020-05-20 21:39:19 +00:00
parent 36e1ad61e8
commit 63939df8bc
1 changed files with 49 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
#- #-
# Copyright (c) 2011 Nathan Whitehorn # Copyright (c) 2011 Nathan Whitehorn
# Copyright (c) 2013-2016 Devin Teske # Copyright (c) 2013-2020 Devin Teske
# All rights reserved. # All rights reserved.
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -60,8 +60,7 @@ country_set()
'wpa_supplicant -B -i "%s" -c "%s/wpa_supplicant.conf"' \ 'wpa_supplicant -B -i "%s" -c "%s/wpa_supplicant.conf"' \
"$WLAN_IFACE" "$BSDINSTALL_TMPETC" "$WLAN_IFACE" "$BSDINSTALL_TMPETC"
if [ "$error_str" ]; then if [ "$error_str" ]; then
$DIALOG \ $DIALOG --title "$msg_error" \
--title "$msg_error" \
--backtitle "$DIALOG_BACKTITLE" \ --backtitle "$DIALOG_BACKTITLE" \
--yes-label Change \ --yes-label Change \
--no-label Ignore \ --no-label Ignore \
@ -70,8 +69,7 @@ country_set()
0 0 || return $SUCCESS # Skip 0 0 || return $SUCCESS # Skip
return $FAILURE # Restart return $FAILURE # Restart
else else
awk 'sub(/^\t\t/,"")||1' \ cat > "$BSDINSTALL_TMPETC/rc.conf.net.wlan" <<-EOF
> "$BSDINSTALL_TMPETC/rc.conf.net.wlan" <<-EOF
create_args_$WLAN_IFACE="$ifconfig_args" create_args_$WLAN_IFACE="$ifconfig_args"
EOF EOF
fi fi
@ -101,7 +99,8 @@ dialog_country_select()
sub(/Country codes:/, ""), sub(/Regulatory.*/, "") { sub(/Country codes:/, ""), sub(/Regulatory.*/, "") {
while (match($0, /[[:upper:]][[:upper:][:digit:]] /)) { while (match($0, /[[:upper:]][[:upper:][:digit:]] /)) {
country = substr($0, RSTART) country = substr($0, RSTART)
sub(/ [[:upper:]][[:upper:][:digit:]].*/, "", country) sub(/ [[:upper:]][[:upper:][:digit:]].*/, "",
country)
code = substr(country, 1, 2) code = substr(country, 1, 2)
desc = substr(country, 4) desc = substr(country, 4)
sub(/[[:space:]]*$/, "", desc) sub(/[[:space:]]*$/, "", desc)
@ -153,7 +152,7 @@ dialog_country_select()
: > "$BSDINSTALL_TMPETC/wpa_supplicant.conf" : > "$BSDINSTALL_TMPETC/wpa_supplicant.conf"
chmod 0600 "$BSDINSTALL_TMPETC/wpa_supplicant.conf" chmod 0600 "$BSDINSTALL_TMPETC/wpa_supplicant.conf"
cat >> "$BSDINSTALL_TMPETC/wpa_supplicant.conf" << EOF cat >> "$BSDINSTALL_TMPETC/wpa_supplicant.conf" <<EOF
ctrl_interface=/var/run/wpa_supplicant ctrl_interface=/var/run/wpa_supplicant
eapol_version=2 eapol_version=2
ap_scan=1 ap_scan=1
@ -279,15 +278,15 @@ if echo "$ENCRYPTION" | grep -q PSK; then
"Password" 2 0 "" 2 12 15 63 1 \ "Password" 2 0 "" 2 12 15 63 1 \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
) || exec "$0" "$@" ) || exec "$0" "$@"
awk 'sub(/^\t/,"")||1' \ awk 'sub(/^\\/,"")||1' \
>> "$BSDINSTALL_TMPETC/wpa_supplicant.conf" <<EOF >> "$BSDINSTALL_TMPETC/wpa_supplicant.conf" <<-EOF
network={ network={
ssid="$NETWORK" \ ssid="$NETWORK"
scan_ssid=$SCANSSID \ scan_ssid=$SCANSSID
psk="$PASS" \ psk="$PASS"
priority=5 \ priority=5
} }
EOF EOF
elif echo "$ENCRYPTION" | grep -q EAP; then elif echo "$ENCRYPTION" | grep -q EAP; then
USERPASS=$( $DIALOG \ USERPASS=$( $DIALOG \
--title "WPA-Enterprise Setup" \ --title "WPA-Enterprise Setup" \
@ -300,19 +299,19 @@ elif echo "$ENCRYPTION" | grep -q EAP; then
"Password" 3 0 "" 3 12 25 63 1 \ "Password" 3 0 "" 3 12 25 63 1 \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
) || exec "$0" "$@" ) || exec "$0" "$@"
awk 'sub(/^\t/,"")||1' \ awk 'sub(/^\\/,"")||1' \
>> "$BSDINSTALL_TMPETC/wpa_supplicant.conf" <<EOF >> "$BSDINSTALL_TMPETC/wpa_supplicant.conf" <<-EOF
network={ network={
ssid="$NETWORK" \ ssid="$NETWORK"
scan_ssid=$SCANSSID \ scan_ssid=$SCANSSID
key_mgmt=WPA-EAP$( \ key_mgmt=WPA-EAP$(
echo "$USERPASS" | awk ' echo "$USERPASS" | awk '
NR == 1 { printf "\n\t\tidentity=\"%s\"", $1 } NR == 1 { printf "\n\tidentity=\"%s\"", $1 }
NR == 2 { printf "\n\t\tpassword=\"%s\"", $1 } NR == 2 { printf "\n\tpassword=\"%s\"", $1 }
' ) ' )
priority=5 \ priority=5
} }
EOF EOF
elif echo "$ENCRYPTION" | grep -q WEP; then elif echo "$ENCRYPTION" | grep -q WEP; then
WEPKEY=$( $DIALOG \ WEPKEY=$( $DIALOG \
--title "WEP Setup" \ --title "WEP Setup" \
@ -324,31 +323,31 @@ elif echo "$ENCRYPTION" | grep -q WEP; then
"WEP Key 0" 2 0 "" 2 12 15 0 1 \ "WEP Key 0" 2 0 "" 2 12 15 0 1 \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
) || exec "$0" "$@" ) || exec "$0" "$@"
awk 'sub(/^\t/,"")||1' \ awk 'sub(/^\\/,"")||1' \
>> "$BSDINSTALL_TMPETC/wpa_supplicant.conf" <<EOF >> "$BSDINSTALL_TMPETC/wpa_supplicant.conf" <<-EOF
network={ network={
ssid="$NETWORK" \ ssid="$NETWORK"
scan_ssid=$SCANSSID \ scan_ssid=$SCANSSID
key_mgmt=NONE \ key_mgmt=NONE
wep_key0="$WEPKEY" \ wep_key0="$WEPKEY"
wep_tx_keyidx=0 \ wep_tx_keyidx=0
priority=5 \ priority=5
} }
EOF EOF
else # Open else # Open
awk 'sub(/^\t/,"")||1' \ awk 'sub(/^\\/,"")||1' \
>> "$BSDINSTALL_TMPETC/wpa_supplicant.conf" <<EOF >> "$BSDINSTALL_TMPETC/wpa_supplicant.conf" <<-EOF
network={ network={
ssid="$NETWORK" \ ssid="$NETWORK"
scan_ssid=$SCANSSID \ scan_ssid=$SCANSSID
key_mgmt=NONE \ key_mgmt=NONE
priority=5 \ priority=5
} }
EOF EOF
fi fi
# Connect to any open networks policy # Connect to any open networks policy
cat >> "$BSDINSTALL_TMPETC/wpa_supplicant.conf" << EOF cat >> "$BSDINSTALL_TMPETC/wpa_supplicant.conf" <<EOF
network={ network={
priority=0 priority=0
key_mgmt=NONE key_mgmt=NONE