revert r12677

arekm says it would break existing configs

svn-id: @12681

diff --git a/lib/functions.network b/lib/functions.network
index bb7ed5ff4a726c36b99537906ff8e2a12d75ecc9..6b03d4b82c2fb94e2227d3262b08e8cb8733d30a 100644 (file)
--- a/lib/functions.network
+++ b/lib/functions.network
@@ -91,10 +91,10 @@ set_dhcpclient()
        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