From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 4 Jun 2010 01:19:33 +0000 (+0200)
Subject: network: Make restart timeout configureable.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03042358ed0aa9471e608e45bada699c812978ff;p=ipfire-3.x.git

network: Make restart timeout configureable.
---

diff --git a/pkgs/core/network/src/functions.cli b/pkgs/core/network/src/functions.cli
index 14df652a9..21bb3c522 100644
--- a/pkgs/core/network/src/functions.cli
+++ b/pkgs/core/network/src/functions.cli
@@ -213,7 +213,7 @@ function cli_restart() {
 	cli_stop $@
 
 	# Give the system some time to calm down
-	sleep 2
+	sleep ${TIMEOUT_RESTART}
 
 	cli_start $@
 }
diff --git a/pkgs/core/network/src/functions.constants b/pkgs/core/network/src/functions.constants
index 2030dc9b5..53b191d25 100644
--- a/pkgs/core/network/src/functions.constants
+++ b/pkgs/core/network/src/functions.constants
@@ -33,7 +33,7 @@ RED_RUN=${RUN_DIR}/red
 PPP_SECRETS=/etc/ppp/secrets
 
 CONFIG_FILE=${CONFIG_DIR}/network_config
-CONFIG_FILE_PARAMS="COLORS DEBUG SHELL"
+CONFIG_FILE_PARAMS="COLORS DEBUG SHELL TIMEOUT_RESTART"
 
 DB_CONNECTION_FILE="${LOG_DIR}/connections.db"
 
@@ -53,3 +53,6 @@ DISCOVER_NOT_SUPPORTED=2
 VALID_ZONES="green orange red grey"
 
 SYS_CLASS_NET="/sys/class/net"
+
+# Timeout values
+TIMEOUT_RESTART=2