Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 53201 | Differences between
and this patch

Collapse All | Expand All

(-)net.eth0.orig (+10 lines)
Lines 45-50 Link Here
45
#	vlans_IFACE				(space-separated list)
45
#	vlans_IFACE				(space-separated list)
46
#	ifconfig_IFACE			(array of ifconfig lines, replaces iface_IFACE)
46
#	ifconfig_IFACE			(array of ifconfig lines, replaces iface_IFACE)
47
#	dhcpcd_IFACE			(command-line args for dhcpcd)
47
#	dhcpcd_IFACE			(command-line args for dhcpcd)
48
#	clearip_IFACE			(if set, clear dhcpcd cache)
48
#	routes_IFACE			(array of route lines)
49
#	routes_IFACE			(array of route lines)
49
#	inet6_IFACE				(array of inet6 lines)
50
#	inet6_IFACE				(array of inet6 lines)
50
#	ifconfig_fallback_IFACE	(fallback ifconfig if dhcp fails)
51
#	ifconfig_fallback_IFACE	(fallback ifconfig if dhcp fails)
Lines 55-60 Link Here
55
	eval vlans_IFACE=\"\$\{iface_${iface}_vlans\}\"
56
	eval vlans_IFACE=\"\$\{iface_${iface}_vlans\}\"
56
	eval ifconfig_IFACE=( \"\$\{ifconfig_$iface\[@\]\}\" )
57
	eval ifconfig_IFACE=( \"\$\{ifconfig_$iface\[@\]\}\" )
57
	eval dhcpcd_IFACE=\"\$\{dhcpcd_$iface\}\"
58
	eval dhcpcd_IFACE=\"\$\{dhcpcd_$iface\}\"
59
	eval clearip_IFACE=\"\$\{clearip_$iface\}\"
58
	eval routes_IFACE=( \"\$\{routes_$iface\[@\]\}\" )
60
	eval routes_IFACE=( \"\$\{routes_$iface\[@\]\}\" )
59
	eval inet6_IFACE=( \"\$\{inet6_$iface\[@\]\}\" )
61
	eval inet6_IFACE=( \"\$\{inet6_$iface\[@\]\}\" )
60
	eval ifconfig_fallback_IFACE=( \"\$\{ifconfig_fallback_$iface\[@\]\}\" )
62
	eval ifconfig_fallback_IFACE=( \"\$\{ifconfig_fallback_$iface\[@\]\}\" )
Lines 88-93 Link Here
88
	local IFACE=${1} i x retval
90
	local IFACE=${1} i x retval
89
	checkconfig || return 1
91
	checkconfig || return 1
90
92
93
	# Check if we should clear the IP address of that interface before DHCPing
94
	if [[ ! -z ${clearip_IFACE} ]]; then
95
		einfo "Clearing cached IP for ${IFACE}"
96
		if [[ -f "/var/cache/dhcpcd-${IFACE}.cache" ]]; then
97
			rm "/var/cache/dhcpcd-${IFACE}.cache"
98
		fi
99
	fi
100
91
	if [[ ${ifconfig_IFACE} != dhcp ]]; then
101
	if [[ ${ifconfig_IFACE} != dhcp ]]; then
92
		# Show the address, but catch if this interface will be inet6 only
102
		# Show the address, but catch if this interface will be inet6 only
93
		i=${ifconfig_IFACE%% *}
103
		i=${ifconfig_IFACE%% *}

Return to bug 53201