From ba9ba4aebb1057079681ecf891fbd2e6ddf9087c Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Wed, 27 Aug 2008 17:13:10 +0000 Subject: remove some silly echo statement constructions in the init script clean up the modules.sample file to have proper lists of cards supported by each module and remove reference to dahdi_dummy since the init script takes care of loading that module git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/trunk@4850 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- dahdi.init | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'dahdi.init') diff --git a/dahdi.init b/dahdi.init index 0f4b705..e0bb6a7 100755 --- a/dahdi.init +++ b/dahdi.init @@ -150,7 +150,7 @@ case "$1" in start) cat "/etc/dahdi/modules" | grep "^[^\#]" | { foundone=false - echo -ne $"Loading DAHDI hardware modules:\n" + echo "Loading DAHDI hardware modules:" while read line; do foundone=true if [ $system = debian ]; then @@ -164,7 +164,7 @@ case "$1" in action " ${line}: " modprobe $line fi done - echo -ne $"\n" + echo "" if ! $foundone; then echo "There aren't any DAHDI hardware modules specified to " echo "load. Please update /etc/dahdi/modules in order to " @@ -172,7 +172,9 @@ case "$1" in exit 1 fi } + TMOUT=$DAHDI_DEV_TIMEOUT # max secs to wait + while [ ! -d /dev/dahdi ] ; do sleep 1 TMOUT=`expr $TMOUT - 1` @@ -181,7 +183,6 @@ case "$1" in exit 1 fi done - sleep 3 # TODO: remove it xpp_startup @@ -214,7 +215,7 @@ case "$1" in # Unload drivers #shutdown_dynamic # FIXME: needs test from someone with dynamic spans if [ $system = debian ]; then - echo -ne $"Unloading DAHDI hardware modules: " + echo -n "Unloading DAHDI hardware modules: " if unload_module dahdi; then echo -n "done" else -- cgit v1.2.3