Deleted Added
full compact
wlanconfig (225539) wlanconfig (245980)
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 225539 2011-09-13 21:39:26Z brueffer $
27# $FreeBSD: head/usr.sbin/bsdinstall/scripts/wlanconfig 245980 2013-01-27 14:49:54Z nwhitehorn $
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

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

55 --pause "Waiting 5 seconds to scan for wireless networks..." \
56 9 40 5 || exit 1
57
58SCAN_RESULTS=`wpa_cli scan_results`
59NETWORKS=`echo "$SCAN_RESULTS" | awk -F '\t' \
60 '/..:..:..:..:..:../ {if (length($5) > 0) printf("\"%s\"\t%s\n", $5, $4);}' |
61 sort | uniq`
62
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

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

55 --pause "Waiting 5 seconds to scan for wireless networks..." \
56 9 40 5 || exit 1
57
58SCAN_RESULTS=`wpa_cli scan_results`
59NETWORKS=`echo "$SCAN_RESULTS" | awk -F '\t' \
60 '/..:..:..:..:..:../ {if (length($5) > 0) printf("\"%s\"\t%s\n", $5, $4);}' |
61 sort | uniq`
62
63if [ -z $NETWORKS ]; then
63if [ -z "$NETWORKS" ]; then
64 dialog --backtitle "FreeBSD Installer" --title "Error" \
65 --yesno "No wireless networks were found. Rescan?" 0 0 && \
66 exec $0 $@
67 exit 1
68fi
69
70exec 3>&1
71NETWORK=`sh -c "dialog --extra-button --extra-label \"Rescan\" \

--- 66 unchanged lines hidden ---
64 dialog --backtitle "FreeBSD Installer" --title "Error" \
65 --yesno "No wireless networks were found. Rescan?" 0 0 && \
66 exec $0 $@
67 exit 1
68fi
69
70exec 3>&1
71NETWORK=`sh -c "dialog --extra-button --extra-label \"Rescan\" \

--- 66 unchanged lines hidden ---