ipsec: Properly validate FQDNs

[people/ms/network.git] / src / dhclient-script

diff --git a/src/dhclient-script b/src/dhclient-script
index 212df75d1bf4b86f024832efb8dd0fcd9e62fb10..c2e0678b582836cb3e8ff1eef0229835d6fabd17 100644 (file)
--- a/src/dhclient-script
+++ b/src/dhclient-script
@@ -168,14 +168,8 @@ case "${reason}" in
                        zone_up ${interface}
                fi
 
-               # If the use configured a delay, we will honour that.
-               if [ -n "${DELAY}"  ]; then
-                       assert isinteger DELAY
-                       sleep ${DELAY}
-
-               # If he didn't, we will try to detect is STP has brought the
-               # bridge up.
-               elif device_is_bridge ${interface}; then
+               # We will try to detect is STP has brought the bridge up
+               if device_is_bridge ${interface}; then
                        counter=60
 
                        while [ ${counter} -gt 0 ]; do
@@ -208,7 +202,7 @@ case "${reason}" in
                fi
 
                case "${reason}" in
-                       BOUND|REBOOT)
+                       BOUND|REBIND|REBOOT)
                                if [ ! "${old_ip_address}" = "${new_ip_address}" ] || \
                                        [ ! "${old_subnet_mask}" = "${new_subnet_mask}" ] || \
                                        [ ! "${old_network_number}" = "${new_network_number}" ] || \
@@ -222,8 +216,6 @@ case "${reason}" in
 
                                        # Set the new ip address.
                                        ip_address_add "${interface}" "${new_ip_address}/${new_prefix}"
-                                       device_set_up "${interface}"
-
 
                                        # A MTU of 576 is used for X.25 and dialup connections. Some broken DHCP
                                        # servers send out an MTU of 576 bytes, which will be ignored.