- Honor DEFROUTE=yes|no for all connection types (#530209)

dhclient-script

@@ -272,11 +272,12 @@ dhconfig() {
             . ${ETCDIR}/dhclient-up-hooks
         fi
 
-        if [[ (( -z "${GATEWAYDEV}" ) ||
-               ( "${GATEWAYDEV}" = "${interface}" )) &&
-              (( -z "$GATEWAY" ) ||
+        if [[ ( "${DEFROUTE}" != "no") &&
+              (( -z "${GATEWAYDEV}" ) ||
+               ( "${GATEWAYDEV}" = "${interface}" )) ]]; then
+            if [[ ( -z "$GATEWAY" ) ||
                   (( -n "$DHCLIENT_IGNORE_GATEWAY" ) &&
-                ( "$DHCLIENT_IGNORE_GATEWAY" = [Yy]* ))) ]]; then
+                   ( "$DHCLIENT_IGNORE_GATEWAY" = [Yy]* )) ]]; then
                 metric="${METRIC:-}"
                 let i="${METRIC:-0}"
                 default_routers=()
@@ -303,9 +304,7 @@ dhconfig() {
                     let i=i+1
                     metric=${i}
                 done
-        elif [[ (( -z "${GATEWAYDEV}" ) ||
-                 ( "${GATEWAYDEV}" = "${interface}" )) &&
-                ( -n "${GATEWAY}" ) ]]; then
+            elif [ -n "${GATEWAY}" ]; then
                 routersubnet=$(mask ${GATEWAY} ${new_subnet_mask})
                 mysubnet=$(mask ${new_ip_address} ${new_subnet_mask})
 
@@ -313,6 +312,7 @@ dhconfig() {
                     ip route replace default via ${GATEWAY} dev ${interface}
                 fi
             fi
+        fi
 
         # static routes
         if [ -n "${new_static_routes}" ]; then

dhcp.spec

@@ -13,7 +13,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  %{basever}p1
-Release:  13%{?dist}
+Release:  14%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -481,6 +481,9 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Mon Nov 23 2009 Jiri Popelka <jpopelka@redhat.com> - 12:4.1.0p1-14
+- Honor DEFROUTE=yes|no for all connection types (#530209)
+
 * Fri Oct 30 2009 Jiri Popelka <jpopelka@redhat.com> - 12:4.1.0p1-13
 - Make dhclient-script add IPv6 address to interface (#531997)