SVN: rc-scripts/trunk/lib/functions.network

[glen]

Author: glen
Date: Thu May 30 23:55:33 2013
New Revision: 12681

Modified:
   rc-scripts/trunk/lib/functions.network
Log:
revert r12677

arekm says it would break existing configs


Modified: rc-scripts/trunk/lib/functions.network
==============================================================================
--- rc-scripts/trunk/lib/functions.network	(original)
+++ rc-scripts/trunk/lib/functions.network	Thu May 30 23:55:33 2013
@@ -91,10 +91,10 @@
 	if [ -z "$DHCP_CLIENT" ]; then
 		if [ "$BOOTPROTO" = "zeroconf" -a -x /usr/sbin/avahi-autoipd ]; then
 			DHCP_CLIENT=/usr/sbin/avahi-autoipd
-		elif [ -x /sbin/dhclient ]; then
-			DHCP_CLIENT=/sbin/dhclient
 		elif [ -x /sbin/dhcpcd ]; then
 			DHCP_CLIENT=/sbin/dhcpcd
+		elif [ -x /sbin/dhclient ]; then
+			DHCP_CLIENT=/sbin/dhclient
 		elif [ -x /sbin/dhcpxd ]; then
 			DHCP_CLIENT=/sbin/dhcpxd
 		elif [ -x /sbin/pump ]; then