From: Jonatan Schlag <jonatan.schlag@ipfire.org>
Date: Fri, 14 Jul 2017 13:40:39 +0000 (+0200)
Subject: dhcp: remove useless delay setting
X-Git-Tag: 009~178
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b98a1b8695551fdc7bfdace0dcc2f9cc2e59ff87;p=network.git

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 212df75d..da77879e 100644
--- 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 5ac01b6f..8bb6aa9c 100644
--- 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"
 				;;