[zaptel-commits] trunk r1082 - in /trunk: ./ build_tools/genmodconf

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Tue May 23 12:51:18 2006
New Revision: 1082

URL: http://svn.digium.com/view/zaptel?rev=1082&view=rev
Log:
Merged revisions 1081 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1081 | kpfleming | 2006-05-23 12:51:00 -0500 (Tue, 23 May 2006) | 2 lines

handle distros that ship pre-releases of module-init-tools

........

Modified:
    trunk/   (props changed)
    trunk/build_tools/genmodconf

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.2-merged (original)
+++ branch-1.2-merged Tue May 23 12:51:18 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-916,918-936,938-949,958,962,970,990,1004,1011,1017,1031,1033,1060,1062,1064-1066,1069,1071,1076,1079
+/branches/1.2:1-916,918-936,938-949,958,962,970,990,1004,1011,1017,1031,1033,1060,1062,1064-1066,1069,1071,1076,1079,1081

Modified: trunk/build_tools/genmodconf
URL: http://svn.digium.com/view/zaptel/trunk/build_tools/genmodconf?rev=1082&r1=1081&r2=1082&view=diff
==============================================================================
--- trunk/build_tools/genmodconf (original)
+++ trunk/build_tools/genmodconf Tue May 23 12:51:18 2006
@@ -42,7 +42,7 @@
 	exit 1
     fi
 elif [ "${1}" == "linux26" ]; then
-    toolver=`/sbin/modprobe --version | awk '{print $$3;}' | cut -d. -f2`
+    toolver=`/sbin/modprobe --version | awk '{print $$3;}' | cut -d. -f2 | cut -d- -f1`
     if [ ${toolver} -ge 2 ]; then
 	cmdopts=\$CMDLINE_OPTS
     fi