View | Details | Raw Unified
Collapse All | Expand All

(-)a/etc/net/scripts/config-wireless (-3 / +13 lines)
 Lines 10-15   usage() Link Here 
10
10
11
[ -z "$1" ] && usage
11
[ -z "$1" ] && usage
12
NAME=$1
12
NAME=$1
13
shift
14
15
# used as action script in wpa_cli, see below
16
[ -z "$1" ] || {
17
    [ "$1" == "CONNECTED" ] && kill `cat /var/run/wpa_cli-$NAME.pid`
18
    exit
19
}
13
20
14
pickup_defaults
21
pickup_defaults
15
pickup_options
22
pickup_options
 Lines 29-38   if [ -x "${IWCONFIG:=$DEFAULT_IWCONFIG}" ]; then Link Here 
29
fi
36
fi
30
37
31
# configure WPA
38
# configure WPA
32
if [ -x "${WPA_SUPPLICANT:=$DEFAULT_WPA_SUPPLICANT}" ]; then
39
if [ -x "${WPA_SUPPLICANT:=$DEFAULT_WPA_SUPPLICANT}" -a \
40
	-x "${WPA_CLI:=$DEFAULT_WPA_CLI}" ]; then
33
	prof_conf=`profiled_filename $MYIFACEDIR/wpa_supplicant.conf`
41
	prof_conf=`profiled_filename $MYIFACEDIR/wpa_supplicant.conf`
34
	if [ -s "$prof_conf" ]; then
42
	if [ -s "$prof_conf" ]; then
35
		$WPA_SUPPLICANT -i$NAME${WPA_DRIVER:+ -D$WPA_DRIVER} -c $prof_conf 2>&1>/dev/null &
43
		$WPA_SUPPLICANT -i$NAME${WPA_DRIVER:+ -D$WPA_DRIVER} \
36
		echo $! >/var/run/wpa_supplicant-$NAME.pid
44
			-B -P/var/run/wpa_supplicant-$NAME.pid -c $prof_conf
45
		# wait until connected
46
		$WPA_CLI -i$NAME -P/var/run/wpa_cli-$NAME.pid -a "$0"
37
	fi
47
	fi
38
fi
48
fi
(-)a/etc/net/scripts/functions (-1 / +2 lines)
 Lines 18-23   DEFAULT_IFPLUGD=/usr/sbin/ifplugd Link Here 
18
DEFAULT_IWPRIV=/sbin/iwpriv
18
DEFAULT_IWPRIV=/sbin/iwpriv
19
DEFAULT_IWCONFIG=/sbin/iwconfig
19
DEFAULT_IWCONFIG=/sbin/iwconfig
20
DEFAULT_WPA_SUPPLICANT=/usr/sbin/wpa_supplicant
20
DEFAULT_WPA_SUPPLICANT=/usr/sbin/wpa_supplicant
21
DEFAULT_WPA_CLI=/usr/sbin/wpa_cli
21
DEFAULT_PLIPCONFIG=/sbin/plipconfig
22
DEFAULT_PLIPCONFIG=/sbin/plipconfig
22
DEFAULT_VCONFIG=/usr/bin/vconfig
23
DEFAULT_VCONFIG=/usr/bin/vconfig
23
DEFAULT_IPSECADM=/usr/sbin/ipsecadm
24
DEFAULT_IPSECADM=/usr/sbin/ipsecadm
 Lines 501-507   declare -frx modprobe_with_rename Link Here 
501
declare -frx eval_string
502
declare -frx eval_string
502
declare -rx DENOISE DEFAULT_BONDMODE IFACEDIR LOCALSCRIPTDIR VARLIBDIR
503
declare -rx DENOISE DEFAULT_BONDMODE IFACEDIR LOCALSCRIPTDIR VARLIBDIR
503
declare -rx VLANTAB HOSTTAB IFTAB PROFILE_FILE PROC_CMDLINE DEFAULT_IFPLUGSTATUS
504
declare -rx VLANTAB HOSTTAB IFTAB PROFILE_FILE PROC_CMDLINE DEFAULT_IFPLUGSTATUS
504
declare -rx DEFAULT_IFPLUGD DEFAULT_IWCONFIG DEFAULT_WPA_SUPPLICANT DEFAULT_PLIPCONFIG
505
declare -rx DEFAULT_IFPLUGD DEFAULT_IWCONFIG DEFAULT_WPA_SUPPLICANT DEFAULT_WPA_CLI DEFAULT_PLIPCONFIG
505
declare -rx DEFAULT_VCONFIG DEFAULT_PENTANETT DEFAULT_PENTAVALT DEFAULT_PENTANET_CONF
506
declare -rx DEFAULT_VCONFIG DEFAULT_PENTANETT DEFAULT_PENTAVALT DEFAULT_PENTANET_CONF
506
declare -rx DEFAULT_PENTAVAL_CONF DEFAULT_IPSECADM DEFAULT_IFENSLAVE DEFAULT_BRCTL
507
declare -rx DEFAULT_PENTAVAL_CONF DEFAULT_IPSECADM DEFAULT_IFENSLAVE DEFAULT_BRCTL
507
declare -rx DEFAULT_ETHTOOL DEFAULT_PPPD DEFAULT_CHAT DEFAULT_PPPOPTIONSFILE
508
declare -rx DEFAULT_ETHTOOL DEFAULT_PPPD DEFAULT_CHAT DEFAULT_PPPOPTIONSFILE