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

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Fri Nov  6 12:32:20 2009
New Revision: 7497

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=7497
Log:
slightly simplify the new dahdi.init

Modified:
    tools/trunk/dahdi.init

Modified: tools/trunk/dahdi.init
URL: http://svnview.digium.com/svn/dahdi/tools/trunk/dahdi.init?view=diff&rev=7497&r1=7496&r2=7497
==============================================================================
--- tools/trunk/dahdi.init (original)
+++ tools/trunk/dahdi.init Fri Nov  6 12:32:20 2009
@@ -78,16 +78,17 @@
 	# xpp_usb keeps the xpds below busy if an xpp hardware is
 	# connected. Hence must be removed before them:
 	case "$module" in xpd_*) mods="xpp_usb $mods";; esac
+
 	for mod in $mods; do
-		(echo $mod | grep dahdi_echocan) > /dev/null 2>&1
-		if [ $? != 0 ]; then
+		case "$mod" in
+		dahdi_echocan_*)
+			ec_modules="$mod $ec_modules"
+			;;
+		*)
 			# run in a subshell, so it won't step over our vars:
 			(unload_module $mod)
-		else
-			ec_modules="$mod $ec_modules"
-		fi
-                # TODO: the following is probably the error handling we want:
-                # if [ $? != 0 ]; then return 1; fi
+			;;
+		esac
 	done
 	# Now that all the other dependencies are unloaded, we can unload the
 	# dahdi_echocan modules.  The drivers that register spans may keep