From 5c55840d97207620c860c685e15444c0eca793d3 Mon Sep 17 00:00:00 2001 From: qwell Date: Thu, 30 Nov 2006 00:26:56 +0000 Subject: Merged revisions 1664 via svnmerge from https://origsvn.digium.com/svn/zaptel/branches/1.4 ................ r1664 | qwell | 2006-11-29 18:24:30 -0600 (Wed, 29 Nov 2006) | 10 lines Merged revisions 1663 via svnmerge from https://origsvn.digium.com/svn/zaptel/branches/1.2 ........ r1663 | qwell | 2006-11-29 18:23:33 -0600 (Wed, 29 Nov 2006) | 2 lines Fix issue that was discovered by using dash as /bin/sh instead of bash. ........ ................ git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1665 5390a7c7-147a-4af0-8ec9-7488f05a26cb --- build_tools/genmodconf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build_tools/genmodconf b/build_tools/genmodconf index 57013a0..34da3ea 100755 --- a/build_tools/genmodconf +++ b/build_tools/genmodconf @@ -31,7 +31,7 @@ # 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 [ "${1}" = "linux24" ]; then if [ -d ${2}/etc/modutils ]; then target=${2}/etc/modutils/zaptel elif [ -f ${2}/etc/modules.conf ]; then @@ -41,7 +41,7 @@ if [ "${1}" == "linux24" ]; then echo No suitable location for module rules can be found... exiting. exit 1 fi -elif [ "${1}" == "linux26" ]; then +elif [ "${1}" = "linux26" ]; then toolver=`/sbin/modprobe --version | awk '{print $$3;}' | cut -d. -f2 | cut -d- -f1` if [ ${toolver} -ge 2 ]; then cmdopts=\$CMDLINE_OPTS @@ -79,13 +79,13 @@ fi echo Building ${target}... -if [ "${1}" == "linux24" ]; then +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 +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} -- cgit v1.2.3