[svn-commits] tzafrir: linux/trunk r8751 - /linux/trunk/build_tools/live_dahdi

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Tue Jun  8 09:44:37 2010
New Revision: 8751

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8751
Log:
live_dahdi: load firmware_class if required

Modprobe firmware_class for modules that may need it (and that we
insmod later)

Modified:
    linux/trunk/build_tools/live_dahdi

Modified: linux/trunk/build_tools/live_dahdi
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/build_tools/live_dahdi?view=diff&rev=8751&r1=8750&r2=8751
==============================================================================
--- linux/trunk/build_tools/live_dahdi (original)
+++ linux/trunk/build_tools/live_dahdi Tue Jun  8 09:44:37 2010
@@ -8,6 +8,7 @@
 AST_SCRIPT=${AST_SCRIPT:-/etc/init.d/asterisk}
 # Use this file to pass options to modules:
 PERLLIBDIR=`perl -V:sitelib | cut -d "'" -f 2`
+EXTRA_MODS="crc_ccitt"
 
 # Manual list of modules. They will be loaded by insmod.
 # If reside in a subdir, add it explicitly.
@@ -55,6 +56,7 @@
 
 # make sure Astribank initialization scripts are from our tree.
 xpp_ARGS="$xpp_ARGS initdir=$FIRMWARE_DIR"
+dahdi_ARGS="$dahdi_ARGS initdir=$FIRMWARE_DIR"
 
 # the same as xpp/utils/dahdi_drivers .
 # With the remote mode, I can't rely on files in the source directory.
@@ -84,6 +86,7 @@
 			# FIXME: better automation of the voicebus
 			# dependency:
 			MODULES_LOAD="$MODULES_LOAD voicebus/dahdi_voicebus $mod/$mod"
+			EXTRA_MODS="$EXTRA_MODS firmware_class"
 				;;
 		wct4xxp | wcte12xp | wctc4xp | wcb4xxp)
 			MODULES_LOAD="$MODULES_LOAD $mod/$mod"
@@ -196,7 +199,9 @@
 	# TODO: Find a way to use modprobe.
 	# Or implement a way to pass arguments to modules here (yuck)
 	set_modules_to_load
-	modprobe crc_ccitt || : # FIXME: Make this optional?
+	for mod in $EXTRA_MODS; do
+		modprobe $mod || : # FIXME: Make this optional?
+	done
 	for module in $MODULES_LOAD; do
 		eval module_args="\$`basename ${module}`_ARGS"
 		insmod $MODULES_DIR/$module.ko $module_args