Deleted Added
full compact
wlanconfig (220351) wlanconfig (225539)
1#!/bin/sh
2#-
3# Copyright (c) 2011 Nathan Whitehorn
4# All rights reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions
8# are met:

--- 10 unchanged lines hidden (view full) ---

19# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25# SUCH DAMAGE.
26#
1#!/bin/sh
2#-
3# Copyright (c) 2011 Nathan Whitehorn
4# All rights reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions
8# are met:

--- 10 unchanged lines hidden (view full) ---

19# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25# SUCH DAMAGE.
26#
27# $FreeBSD: head/usr.sbin/bsdinstall/scripts/wlanconfig 220351 2011-04-05 03:11:21Z nwhitehorn $
27# $FreeBSD: head/usr.sbin/bsdinstall/scripts/wlanconfig 225539 2011-09-13 21:39:26Z brueffer $
28
29echo -n > $BSDINSTALL_TMPETC/wpa_supplicant.conf
30chmod 0600 $BSDINSTALL_TMPETC/wpa_supplicant.conf
31
32echo "ctrl_interface=/var/run/wpa_supplicant" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf
33echo "eapol_version=2" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf
34echo "ap_scan=1" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf
35echo "fast_reauth=1" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf

--- 51 unchanged lines hidden (view full) ---

87ENCRYPTION=`echo "$NETWORKS" | awk -F '\t' \
88 "/^\"$NETWORK\"\t/ {printf(\"%s\n\", \\\$2 );}"`
89
90if echo $ENCRYPTION | grep -q 'PSK'; then
91 exec 3>&1
92 PASS=`dialog --insecure --backtitle "FreeBSD Installer" \
93 --title "WPA Setup" --mixedform "" 0 0 0 \
94 "SSID" 1 0 "$NETWORK" 1 12 0 0 2 \
28
29echo -n > $BSDINSTALL_TMPETC/wpa_supplicant.conf
30chmod 0600 $BSDINSTALL_TMPETC/wpa_supplicant.conf
31
32echo "ctrl_interface=/var/run/wpa_supplicant" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf
33echo "eapol_version=2" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf
34echo "ap_scan=1" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf
35echo "fast_reauth=1" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf

--- 51 unchanged lines hidden (view full) ---

87ENCRYPTION=`echo "$NETWORKS" | awk -F '\t' \
88 "/^\"$NETWORK\"\t/ {printf(\"%s\n\", \\\$2 );}"`
89
90if echo $ENCRYPTION | grep -q 'PSK'; then
91 exec 3>&1
92 PASS=`dialog --insecure --backtitle "FreeBSD Installer" \
93 --title "WPA Setup" --mixedform "" 0 0 0 \
94 "SSID" 1 0 "$NETWORK" 1 12 0 0 2 \
95 "Password" 2 0 "" 2 12 15 0 1 \
95 "Password" 2 0 "" 2 12 15 63 1 \
96 2>&1 1>&3` \
97 || exec $0 $@
98 exec 3>&-
99echo "network={
100 ssid=\"$NETWORK\"
101 psk=\"$PASS\"
102 priority=5
103}" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf

--- 34 unchanged lines hidden ---
96 2>&1 1>&3` \
97 || exec $0 $@
98 exec 3>&-
99echo "network={
100 ssid=\"$NETWORK\"
101 psk=\"$PASS\"
102 priority=5
103}" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf

--- 34 unchanged lines hidden ---