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

Collapse All | Expand All

(-)net.eth0.ori (-5 / +5 lines)
Lines 320-326 Link Here
320
320
321
# bool iface_stop_dhcp(char *iface)
321
# bool iface_stop_dhcp(char *iface)
322
#
322
#
323
# Stop DHCP on an interface by calling dhcpcd -z
323
# Stop DHCP on an interface by calling udhcpc -z
324
#
324
#
325
# Returns 0 (true) when there appears to be an DHCP lease, and we
325
# Returns 0 (true) when there appears to be an DHCP lease, and we
326
# attempted to release it.  This does not necessarily indicate that
326
# attempted to release it.  This does not necessarily indicate that
Lines 329-341 Link Here
329
iface_stop_dhcp() {
329
iface_stop_dhcp() {
330
	local iface=$1 count
330
	local iface=$1 count
331
331
332
	if ! /sbin/dhcpcd -z ${iface} &>${devnull}; then
332
	if ! /sbin/udhcpc -z ${iface} &>${devnull}; then
333
		return 1
333
		return 1
334
	fi
334
	fi
335
335
336
	einfo "  Releasing DHCP lease for ${iface}"
336
	einfo "  Releasing DHCP lease for ${iface}"
337
	for ((count = 0; count < 9; count = count + 1)); do
337
	for ((count = 0; count < 9; count = count + 1)); do
338
		/sbin/dhcpcd -z ${iface} &>${devnull} || break
338
		/sbin/udhcpc -z ${iface} &>${devnull} || break
339
		sleep 1
339
		sleep 1
340
	done
340
	done
341
	[[ ${count} -lt 9 ]]
341
	[[ ${count} -lt 9 ]]
Lines 375-381 Link Here
375
			fi
375
			fi
376
376
377
			# Bring up DHCP for this interface (or alias)
377
			# Bring up DHCP for this interface (or alias)
378
			/sbin/dhcpcd ${dhcpcd_IFACE[i]} ${label}
378
			/sbin/udhcpc ${dhcpcd_IFACE[i]} ${label}
379
			eend $?
379
			eend $?
380
			retval=$?
380
			retval=$?
381
381
Lines 468-474 Link Here
468
			fi
468
			fi
469
469
470
			# Bring up DHCP for this interface (or alias)
470
			# Bring up DHCP for this interface (or alias)
471
			/sbin/dhcpcd ${dhcpcd_IFACE[i]} ${iface}
471
			/sbin/udhcpc ${dhcpcd_IFACE[i]} ${iface}
472
			eend $?
472
			eend $?
473
			retval=$?
473
			retval=$?
474
474

Return to bug 34484