[dahdi-commits] tzafrir: tools/trunk r7334 - /tools/trunk/dahdi.init

[SVN commits to the DAHDI project]

Author: tzafrir
Date: Sun Oct  4 08:35:51 2009
New Revision: 7334

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=7334
Log:
dahdi.init: move module loading to a separate function

Move the module loading parts of the dahdi init script to a seperate
function - load_modules. To be used by a later commit.

There is not functional change here (but the diff is confusing).

Modified:
    tools/trunk/dahdi.init

Modified: tools/trunk/dahdi.init
URL: http://svnview.digium.com/svn/dahdi/tools/trunk/dahdi.init?view=diff&rev=7334&r1=7333&r2=7334
==============================================================================
--- tools/trunk/dahdi.init (original)
+++ tools/trunk/dahdi.init Sun Oct  4 08:35:51 2009
@@ -144,21 +144,7 @@
 	$DAHDI_CFG_CMD -s
 }
 
-if [ ! -x "$DAHDI_CFG" ]; then
-       echo "dahdi_cfg not executable"
-       exit 0
-fi
-
-if [ ! -f /etc/dahdi/system.conf ]; then
-	echo "/etc/dahdi/system.conf not found. Nothing to do."
-       exit 0
-fi
-
-RETVAL=0
-
-# See how we were called.
-case "$1" in
-  start)
+load_modules() {
   	# Some systems, e.g. Debian Lenny, add here -b, which will break
 	# loading of modules blacklisted in modprobe.d/*
 	unset MODPROBE_OPTIONS
@@ -181,6 +167,24 @@
 		fi
 	done
 	echo ""
+}
+
+if [ ! -x "$DAHDI_CFG" ]; then
+       echo "dahdi_cfg not executable"
+       exit 0
+fi
+
+if [ ! -f /etc/dahdi/system.conf ]; then
+	echo "/etc/dahdi/system.conf not found. Nothing to do."
+       exit 0
+fi
+
+RETVAL=0
+
+# See how we were called.
+case "$1" in
+  start)
+  	load_modules
 
 	TMOUT=$DAHDI_DEV_TIMEOUT # max secs to wait