===================================================================
RCS file: RCS/ifup,v
retrieving revision 1.1
diff -u -r1.1 ifup
--- ifup	2002/06/18 16:52:09	1.1
+++ ifup	2002/06/18 23:32:31
@@ -138,17 +138,21 @@
 if [ -n "${DYNCONFIG}" ]; then
     PUMPARGS=$PUMPARGS
     DHCPCDARGS="$DHCPCDARGS -n"
+    DHCLIENTARGS="$DHCLIENTARGS"
     if [ -n "${DHCP_HOSTNAME}" ]; then
        PUMPARGS="${PUMPARGS} -h ${DHCP_HOSTNAME}"
        DHCPCDARGS="${DHCPCDARGS} -h ${DHCP_HOSTNAME}"
+       # for DHCLIENT, set this in /etc/dhclient.conf
     fi
     if need_hostname; then
        PUMPARGS="${PUMPARGS} --lookup-hostname"
        DHCPCDARGS="${DHCPCDARGS} -H"
+       # for DHCLIENT, set this in /etc/dhclient.conf
     fi
     if [ "${PEERDNS}" = "no" ]; then
        PUMPARGS="${PUMPARGS} -d"
        DHCPCDARGS="${DHCPCDARGS} -R"
+       # for DHCLIENT, set this in /etc/dhclient.conf
     fi
     echo -n $"Determining IP information for ${DEVICE}..."
 
@@ -160,7 +164,9 @@
 	FWHACK=1
     fi
     
-    if [ -x /sbin/dhcpcd ] && /sbin/dhcpcd ${DHCPCDARGS} ${DEVICE} ; then
+    if [ -x /sbin/dhclient ] && /sbin/dhclient ${DHCLIENTARGS} ${DEVICE} ; then
+	echo $" done."
+    elif [ -x /sbin/dhcpcd ] && /sbin/dhcpcd ${DHCPCDARGS} ${DEVICE} ; then
 	echo $" done."
     elif [ -z "`pidof -x dhcpcd`" ] && [ -x /sbin/pump ] && /sbin/pump ${PUMPARGS} -i ${DEVICE}; then
 	echo $" done."