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

Allow $BSDINSTALL_TMPETC to contain whitespace or special chars

Browse Source
This commit is contained in:
dteske 2016-12-12 18:38:18 +00:00
parent 037f67880c
commit 2abc445326
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,7 +56,7 @@ country_set()
if [ "$iface_up" ]; then if [ "$iface_up" ]; then
# Restart wpa_supplicant(8) (should not fail). # Restart wpa_supplicant(8) (should not fail).
wpa_supplicant -B -i $WLAN_IFACE -c \ wpa_supplicant -B -i $WLAN_IFACE -c \
$BSDINSTALL_TMPETC/wpa_supplicant.conf "$BSDINSTALL_TMPETC/wpa_supplicant.conf"
fi fi
if [ "$error_str" ]; then if [ "$error_str" ]; then
dialog --backtitle "FreeBSD Installer" --title "Error" \ dialog --backtitle "FreeBSD Installer" --title "Error" \
@ -68,9 +68,9 @@ country_set()
return $SUCCESS # Skip return $SUCCESS # Skip
fi fi
else else
: > $BSDINSTALL_TMPETC/rc.conf.net.wlan : > "$BSDINSTALL_TMPETC/rc.conf.net.wlan"
echo create_args_$WLAN_IFACE=\"$ifconfig_args\" >> \ echo create_args_$WLAN_IFACE=\"$ifconfig_args\" >> \
$BSDINSTALL_TMPETC/rc.conf.net.wlan "$BSDINSTALL_TMPETC/rc.conf.net.wlan"
fi fi
return $SUCCESS return $SUCCESS
@ -142,21 +142,21 @@ dialog_country_select()
############################################################ MAIN ############################################################ MAIN
echo -n > $BSDINSTALL_TMPETC/wpa_supplicant.conf echo -n > "$BSDINSTALL_TMPETC/wpa_supplicant.conf"
chmod 0600 $BSDINSTALL_TMPETC/wpa_supplicant.conf chmod 0600 "$BSDINSTALL_TMPETC/wpa_supplicant.conf"
echo "ctrl_interface=/var/run/wpa_supplicant" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf echo "ctrl_interface=/var/run/wpa_supplicant" >> "$BSDINSTALL_TMPETC/wpa_supplicant.conf"
echo "eapol_version=2" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf echo "eapol_version=2" >> "$BSDINSTALL_TMPETC/wpa_supplicant.conf"
echo "ap_scan=1" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf echo "ap_scan=1" >> "$BSDINSTALL_TMPETC/wpa_supplicant.conf"
echo "fast_reauth=1" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf echo "fast_reauth=1" >> "$BSDINSTALL_TMPETC/wpa_supplicant.conf"
echo >> $BSDINSTALL_TMPETC/wpa_supplicant.conf echo >> "$BSDINSTALL_TMPETC/wpa_supplicant.conf"
# #
# Try to reach wpa_supplicant. If it isn't running and we can modify the # Try to reach wpa_supplicant. If it isn't running and we can modify the
# existing system, start it. Otherwise, fail. # existing system, start it. Otherwise, fail.
# #
(wpa_cli ping >/dev/null 2>/dev/null || ([ "$BSDINSTALL_CONFIGCURRENT" ] && (wpa_cli ping >/dev/null 2>/dev/null || ([ "$BSDINSTALL_CONFIGCURRENT" ] &&
wpa_supplicant -B -i $1 -c $BSDINSTALL_TMPETC/wpa_supplicant.conf)) || wpa_supplicant -B -i $1 -c "$BSDINSTALL_TMPETC/wpa_supplicant.conf")) ||
(dialog --backtitle "FreeBSD Installer" --title "Error" --msgbox \ (dialog --backtitle "FreeBSD Installer" --title "Error" --msgbox \
"Could not start wpa_supplicant!" 0 0; exit 1) || exit 1 "Could not start wpa_supplicant!" 0 0; exit 1) || exit 1
@ -260,7 +260,7 @@ echo "network={
scan_ssid=$SCANSSID scan_ssid=$SCANSSID
psk=\"$PASS\" psk=\"$PASS\"
priority=5 priority=5
}" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf }" >> "$BSDINSTALL_TMPETC/wpa_supplicant.conf"
elif echo $ENCRYPTION | grep -q EAP; then elif echo $ENCRYPTION | grep -q EAP; then
exec 3>&1 exec 3>&1
USERPASS=$( dialog --insecure --backtitle "FreeBSD Installer" \ USERPASS=$( dialog --insecure --backtitle "FreeBSD Installer" \
@ -274,7 +274,7 @@ elif echo $ENCRYPTION | grep -q EAP; then
echo "network={ echo "network={
ssid=\"$NETWORK\" ssid=\"$NETWORK\"
scan_ssid=$SCANSSID scan_ssid=$SCANSSID
key_mgmt=WPA-EAP" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf key_mgmt=WPA-EAP" >> "$BSDINSTALL_TMPETC/wpa_supplicant.conf"
echo "$USERPASS" | awk ' echo "$USERPASS" | awk '
{ {
if (NR == 1) { if (NR == 1) {
@ -282,9 +282,9 @@ echo "$USERPASS" | awk '
} else if (NR == 2) { } else if (NR == 2) {
printf " password=\"%s\"\n", $1; printf " password=\"%s\"\n", $1;
} }
}' >> $BSDINSTALL_TMPETC/wpa_supplicant.conf }' >> "$BSDINSTALL_TMPETC/wpa_supplicant.conf"
echo " priority=5 echo " priority=5
}" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf }" >> "$BSDINSTALL_TMPETC/wpa_supplicant.conf"
elif echo $ENCRYPTION | grep -q WEP; then elif echo $ENCRYPTION | grep -q WEP; then
exec 3>&1 exec 3>&1
WEPKEY=$( dialog --insecure --backtitle "FreeBSD Installer" \ WEPKEY=$( dialog --insecure --backtitle "FreeBSD Installer" \
@ -300,21 +300,21 @@ echo "network={
wep_key0=\"$WEPKEY\" wep_key0=\"$WEPKEY\"
wep_tx_keyidx=0 wep_tx_keyidx=0
priority=5 priority=5
}" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf }" >> "$BSDINSTALL_TMPETC/wpa_supplicant.conf"
else # Open else # Open
echo "network={ echo "network={
ssid=\"$NETWORK\" ssid=\"$NETWORK\"
scan_ssid=$SCANSSID scan_ssid=$SCANSSID
key_mgmt=NONE key_mgmt=NONE
priority=5 priority=5
}" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf }" >> "$BSDINSTALL_TMPETC/wpa_supplicant.conf"
fi fi
# Connect to any open networks policy # Connect to any open networks policy
echo "network={ echo "network={
priority=0 priority=0
key_mgmt=NONE key_mgmt=NONE
}" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf }" >> "$BSDINSTALL_TMPETC/wpa_supplicant.conf"
# Bring up new network # Bring up new network
if [ "$BSDINSTALL_CONFIGCURRENT" ]; then if [ "$BSDINSTALL_CONFIGCURRENT" ]; then