Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 108345
Collapse All | Expand All

(-)dhcpcd-wrapper (-11 / +22 lines)
Lines 15-38 Link Here
15
15
16
. /lib/rcscripts/net.modules.d/helpers.d/module-loader
16
. /lib/rcscripts/net.modules.d/helpers.d/module-loader
17
17
18
if [[ ${action} == "up" ]]; then
18
# Map MAC address variables to interface variables
19
	# Map MAC address variables to interface variables
19
macnet_pre_start "${interface}" 1>/dev/null
20
	macnet_pre_start "${interface}" 1>/dev/null
21
20
22
	# Map wireless ESSID variables to interface variables
21
# Map wireless ESSID variables to interface variables
23
	if [[ -n ${wireless_module} ]]; then
22
if [[ -n ${wireless_module} ]]; then
24
		if wireless_check_extensions "${interface}" ; then
23
	if wireless_check_extensions "${interface}" ; then
25
			essidnet_pre_start "${interface}" 1>/dev/null
24
		essidnet_pre_start "${interface}" 1>/dev/null
26
		fi
27
	fi
25
	fi
26
fi
27
28
# Add any search paths if we have any defined
29
ifvar=$( bash_variable "${interface}" )
28
30
29
	# Add any search paths if we have any defined
31
if [[ ${action} == "up" ]]; then
30
	ifvar=$( bash_variable "${interface}" )
31
	eval d=\" \$\{dhcp_${ifvar}\} \"
32
	eval d=\" \$\{dhcp_${ifvar}\} \"
32
	[[ ${d} == "  " ]] && d=" ${dhcp} "
33
	[[ ${d} == "  " ]] && d=" ${dhcp} "
33
34
34
	resolv="${statedir}/${interface}/resolv.conf"
35
	resolv="${statedir}/${interface}/resolv.conf"
35
	
36
36
	if [[ ${d} != *" nodns "* ]]; then
37
	if [[ ${d} != *" nodns "* ]]; then
37
		eval search=\"\$\{dns_search_${ifvar}\}\"
38
		eval search=\"\$\{dns_search_${ifvar}\}\"
38
		if [[ -n ${search} ]]; then
39
		if [[ -n ${search} ]]; then
Lines 46-51 Link Here
46
	system_dns_extra "${interface}" "${resolv}"
47
	system_dns_extra "${interface}" "${resolv}"
47
fi
48
fi
48
49
50
# As we override the -c option, we need to call the specified script ourself
51
eval opts=\"\$\{dhcpcd_${ifvar}\}\"
52
exe="${opts##* -c }"
53
if [[ -n ${exe} && ${exe} != "${opts}" ]]; then
54
	exe="${exe%% *}"
55
else
56
	exe="/etc/dhcpc/dhcpcd.exe"
57
fi
58
[[ -x ${exe} ]] && ( ${exe} "$@" 1>/dev/null )
59
49
. /lib/rcscripts/net.modules.d/helpers.d/dhcp-state
60
. /lib/rcscripts/net.modules.d/helpers.d/dhcp-state
50
61
51
# vim:ts=4
62
# vim:ts=4

Return to bug 108345