Respect ZEROCONF variable for dhcpcd.

svn-id: @11472

diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index 11e09b375e51dc32b946dc6ce2e3a36fa1d3c502..8242e4d31f0e45841da5a28887e425a67a39c909 100755 (executable)
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -147,6 +147,9 @@ if [ -n "$BOOTPROTO" -a "$BOOTPROTO" != "none" -a "$BOOTPROTO" != "static" ]; th
                          dhcpcd)
                                [ -n "$DHCP_HOSTNAME" ] && DHCP_ARGS="-h $DHCP_HOSTNAME"
                                DHCP_ARGS="$DHCP_ARGS $DEVICE"
+                               if is_no "$ZEROCONF"; then
+                                       DHCP_ARGS="$DHCP_ARGS --noipv4ll"
+                               fi
                                ;;
                          dhcpxd)
                                [ -n "$DHCP_HOSTNAME" ] && DHCP_ARGS="-H $DHCP_HOSTNAME"