[patch] Updated Mike's patch with some minor corrections

dhcpcd_backport_up1.patch (text/plain), 2.50 KB, created by Gil Kloepfer on 2010-09-07 14:01:16 UTC

--- dhcpcd.sh.ORIG	2010-09-07 07:15:27.000000000 -0500
+++ dhcpcd.sh	2010-09-07 08:56:03.000000000 -0500
@@ -60,42 +60,68 @@
 #
 # Returns 0 (true) when a DHCP address is obtained, otherwise 1
 dhcpcd_start() {
-	local iface="$1" opts= pidfile="/var/run/dhcpcd-$1.pid"
+	local iface="$1" new= args= pidfile="/var/run/dhcpcd-$1.pid"
 	local ifvar=$(bash_variable "${iface}") metric= d=
 
 	interface_exists "${iface}" true || return 1
 
-	# Get our options
-	opts="dhcpcd_${ifvar}"
-	opts="${dhcpcd} ${!opts}"
+	# Get dhcpcd options
+ 	eval args=\$dhcpcd_${ifvar}
+	[ ! -z "${dhcpcd}" ] && args="${dhcpcd} ${args}"
+
+	# Get generic dhcp options
+	eval opts=\$dhcp_${ifvar}
+	[ -z "${opts}" ] && opts=${dhcp}
+
+	case "$(dhcpcd --version)" in
+			"dhcpcd "[123]*) new=false;;
+			*) new=true;;
+	esac
 
 	# Map some generic options to dhcpcd
-	d="dhcp_${ifvar}"
-	d=" ${!d} "
-	[[ ${d} == "  " ]] && d=" ${dhcp} "
-	[[ ${d} == *" nodns "* ]] && opts="${opts} -R"
-	[[ ${d} == *" nontp "* ]] && opts="${opts} -N"
-	[[ ${d} == *" nonis "* ]] && opts="${opts} -Y"
-	[[ ${d} == *" nogateway "* ]] && opts="${opts} -G"
-	if [[ ${d} == *" nosendhost "* ]] ; then
-		opts="${opts} -h ''"
-	else
-		# We transmit the hostname by default
-		if [[ " ${opts} " != *" -h "* ]]; then
-			local hname=$(hostname)
-			[[ -n ${hname} && ${hname} != "(none)" && ${hname} != "localhost" ]] \
-				&& opts="-h \"${hname}\" ${opts}"
-		fi
+	for opt in ${opts}; do
+		case "${opt}" in
+			nodns)
+				if ${new}; then
+					args="${args} -C resolv.conf"
+				else
+					args="${args} -R"
+				fi
+				;;
+			nontp)
+				if ${new}; then
+					args="${args} -C ntp.conf"
+				else
+					args="${args} -N"
+				fi
+				;;
+			nonis)
+				if ${new}; then
+					args="${args} -C yp.conf"
+				else
+					args="${args} -Y"
+				fi
+				;;
+			nogateway) args="${args} -G";;
+			nosendhost) args="${args} -h ''";;
+		esac
+	done
+
+	# We transmit the hostname by default
+	if [[ " ${args} " != *" -h "* ]]; then
+		local hname=$(hostname)
+		[[ -n ${hname} && ${hname} != "(none)" && ${hname} != "localhost" ]] \
+			&& args="-h \"${hname}\" ${args}"
 	fi
 
 	# Add our route metric
 	metric="metric_${ifvar}"
-	[[ -n ${!metric} && ${!metric} != "0" ]] && opts="${opts} -m ${!metric}"
+	[[ -n ${!metric} && ${!metric} != "0" ]] && args="${args} -m ${!metric}"
 
 	# Bring up DHCP for this interface (or alias)
 	ebegin "Running dhcpcd"
 
-	eval /sbin/dhcpcd "${opts}" "${iface}"
+	eval /sbin/dhcpcd "${args}" "${iface}"
 	eend $? || return 1
 
 	# DHCP succeeded, show address retrieved