remove some more unnecessary stuff, and update genmodconf to no longer support 2.4 kernels, have proper name references, etc.

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4503 a0bf4364-ded3-4de4-8d8a-66a801d63aff

1 files changed, 29 insertions, 56 deletions

diff --git a/build_tools/genmodconf b/build_tools/genmodconf
index ada453e..cf1864b 100755
--- a/build_tools/genmodconf
+++ b/build_tools/genmodconf
@@ -1,67 +1,48 @@
 #!/bin/sh
 
 # this script makes an attempt to build a proper set of rules
-# for loading the Zaptel modules and automatically running ztcfg
+# for loading the DAHDI modules and automatically running dahdi_xcfg
 #
-# it accepts three parameters:
-#   the kernel major version being targeted (either linux24 or linux26)
+# it accepts two parameters:
 #   the root prefix to be used for finding/creating the files
 #   the list of module names being installed
 #
 # the process is as follows:
 #
-# for linux24, the file can be located either at /etc/modules.conf (combined
-# with all other rules) or in /etc/modutils/zaptel (only the Zaptel rules)
+# the file can be located at /etc/modprobe.conf (combined with all
+# other rules), /etc/modprobe.d/dahdi (DAHDI only) or /etc/modules.d/dahdi
+# (DAHDI only)
 #
-# for linux26, the file can be located at /etc/modprobe.conf (combined with all
-# other rules), /etc/modprobe.d/zaptel (Zaptel only) or /etc/modules.d/zaptel
-# (Zaptel only)
-#
-# when the file is Zaptel rules only, then we don't preserve the existing
+# when the file is DAHDI rules only, then we don't preserve the existing
 # contents of the file; the system administrator can put desired options and
 # overrides in a separate file with a name that appears earlier in the sort
 # order, so there is no need to edit the file produced by this script
 #
 # when the file is combined with all other rules, then we make a backup
-# of it and remove all the old Zaptel rules we can find, replacing them with
+# of it and remove all the old DAHDI rules we can find, replacing them with
 # new ones
 #
-# in addition, for linux26, versions of module-init-tools 3.2.0 and later
+# in addition, versions of module-init-tools 3.2.0 and later
 # have the ability to pass module parameters specified on the modprobe command
 # line to commands in 'install' rules, thus keeping them from being lost, so
 # we try to determine what version is installed and take advantage of that
 
-if [ "${1}" = "linux24" ]; then
-    if [ -d ${2}/etc/modutils ]; then
-	target=${2}/etc/modutils/zaptel
-    elif [ -f ${2}/etc/modules.conf ]; then
-	target=${2}/etc/modules.conf
-	combined=1
-    else
-	echo No suitable location for module rules can be found... exiting.
-	exit 1
-    fi
-elif [ "${1}" = "linux26" ]; then
-    toolver=`/sbin/modprobe --version 2>/dev/null| awk '{print $3}' | cut -d. -f2 | cut -d- -f1`
-    if [ ${toolver} -ge 2 ]; then
-	cmdopts=\$CMDLINE_OPTS
-    fi
-    if [ -d ${2}/etc/modprobe.d ]; then
-	target=${2}/etc/modprobe.d/zaptel
-    elif [ -d ${2}/etc/modules.d ]; then
-	target=${2}/etc/modules.d/zaptel
-    elif [ -f ${2}/etc/modprobe.conf ]; then
-	target=${2}/etc/modprobe.conf
-	combined=1
-    elif [ -f ${2}/etc/conf.modules ]; then
-	target=${2}/etc/conf.modules
-	combined=1
-    else
-	echo No suitable location for module rules can be found... exiting.
-	exit 1
-    fi
+toolver=`/sbin/modprobe --version 2>/dev/null| awk '{print $3}' | cut -d. -f2 | cut -d- -f1`
+if [ ${toolver} -ge 2 ]; then
+    cmdopts=\$CMDLINE_OPTS
+fi
+if [ -d ${1}/etc/modprobe.d ]; then
+    target=${1}/etc/modprobe.d/dahdi
+elif [ -d ${1}/etc/modules.d ]; then
+    target=${1}/etc/modules.d/dahdi
+elif [ -f ${1}/etc/modprobe.conf ]; then
+    target=${1}/etc/modprobe.conf
+    combined=1
+elif [ -f ${1}/etc/conf.modules ]; then
+    target=${1}/etc/conf.modules
+    combined=1
 else
-    echo Unknown kernel build version requested... exiting.
+    echo No suitable location for module rules can be found... exiting.
     exit 1
 fi
 
@@ -79,19 +60,11 @@ fi
 
 echo Building ${target}...
 
-if [ "${1}" = "linux24" ]; then
-    for mod in ${3}; do
-	if ! grep -q "post-install ${mod} " ${target}; then
-	    echo "post-install ${mod} /sbin/ztcfg" >> ${target}
-	fi
-    done
-elif [ "${1}" = "linux26" ]; then
-    for mod in ${3}; do
-	if ! grep -q "install ${mod} " ${target}; then
-	    echo "install ${mod} /sbin/modprobe --ignore-install ${mod} ${cmdopts} && /sbin/ztcfg" >> ${target}
-	fi
-    done
-fi
+for mod in ${2}; do
+    if ! grep -q "install ${mod} " ${target}; then
+	echo "install ${mod} /sbin/modprobe --ignore-install ${mod} ${cmdopts} && /sbin/ztcfg" >> ${target}
+    fi
+done
 
 if [ -z "${combined}" ]; then
     echo "***"
@@ -102,6 +75,6 @@ if [ -z "${combined}" ]; then
     echo "*** In the future, do not edit ${target}, but"
     echo "*** instead put your changes in another file"
     echo "*** in the same directory so that they will not"
-    echo "*** be overwritten by future Zaptel updates."
+    echo "*** be overwritten by future DAHDI updates."
     echo "***"
 fi