diff options
author | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-07-11 13:22:25 +0000 |
---|---|---|
committer | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-07-11 13:22:25 +0000 |
commit | 59ff548fa289b6e04182a125f482e426dc6b00f5 (patch) | |
tree | b8697b8a55f2122bcc2bbab9f1054cdbeaa9130a | |
parent | 55a16b21f754d8e92997eae0744e39760c8171b9 (diff) |
A more robust modules loading order, IMHO.
If this breaks, the first thing to try is to remove faulty run of zaptel
from modprobe.conf .
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@2716 5390a7c7-147a-4af0-8ec9-7488f05a26cb
-rw-r--r-- | zaptel.init | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/zaptel.init b/zaptel.init index 04916f7..92c431d 100644 --- a/zaptel.init +++ b/zaptel.init @@ -164,17 +164,21 @@ RETVAL=0 # See how we were called. case "$1" in start) - # Load drivers - rmmod wcusb 2> /dev/null - rmmod wcfxsusb 2> /dev/null - rmmod audio 2> /dev/null - if [ $system = debian ]; then - echo -n "Loading zaptel framework: " - modprobe zaptel ${ARGS} 2> /dev/null && echo -n "done" - echo "." - elif [ $system = redhat ]; then - action "Loading zaptel framework: " modprobe zaptel ${ARGS} - fi + #if [ $system = debian ]; then + # echo -n "Loading zaptel framework: " + # modprobe zaptel ${ARGS} 2> /dev/null && echo -n "done" + # echo "." + #elif [ $system = redhat ]; then + # action "Loading zaptel framework: " modprobe zaptel ${ARGS} + #fi + echo -n "Loading zaptel hardware modules:" + for x in $MODULES; do + eval localARGS="\$${x}_ARGS" + if modprobe ${x} ${ARGS} ${localARGS} 2> /dev/null; then + echo -n " $x" + fi + done + xpp_startup echo -n "Waiting for zap to come online..." TMOUT=10 # max secs to wait while [ ! -d /dev/zap ] ; do @@ -186,16 +190,7 @@ case "$1" in fi done echo "OK" - echo -n "Loading zaptel hardware modules:" - for x in $MODULES; do - eval localARGS="\$${x}_ARGS" - if modprobe ${x} ${ARGS} ${localARGS} 2> /dev/null; then - echo -n " $x" - fi - done - sleep 3 # TODO: remove it - - xpp_startup + #sleep 3 # TODO: remove it if head -c 0 /dev/zap/pseudo; then echo "No Zaptel timing source sound. loading ztdummy" |