dhcp: remove useless delay setting

Fixes: #11420
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/dhclient-script b/src/dhclient-script
index 212df75d1bf4b86f024832efb8dd0fcd9e62fb10..da77879e4c10f99fa5566add48fa5abc731de5bc 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

diff --git a/src/hooks/configs/dhcp b/src/hooks/configs/dhcp
index 5ac01b6fd8e9a9e6906f8ee685f7a3939b6c0ebb..8bb6aa9c028b4022c5895ca9b5d8ed384adbfce7 100644 (file)
--- a/src/hooks/configs/dhcp
+++ b/src/hooks/configs/dhcp
@@ -21,16 +21,13 @@
 
 . /usr/lib/network/header-config
 
-HOOK_CONFIG_SETTINGS="HOOK DELAY ENABLE_IPV6 ENABLE_IPV4"
+HOOK_CONFIG_SETTINGS="HOOK ENABLE_IPV6 ENABLE_IPV4"
 
 # Default settings.
-DELAY=0
 ENABLE_IPV6="on"
 ENABLE_IPV4="on"
 
 hook_check_config_settings() {
-       assert isset DELAY
-       assert isinteger DELAY
        assert isset ENABLE_IPV6
        assert isbool ENABLE_IPV6
        assert isset ENABLE_IPV4
@@ -40,9 +37,6 @@ hook_check_config_settings() {
 hook_parse_cmdline() {
        while [ $# -gt 0 ]; do
                case "${1}" in
-                       --delay=*)
-                               DELAY="$(cli_get_val "${1}")"
-                               ;;
                        --enable-ipv6)
                                ENABLE_IPV6="on"
                                ;;