Merged revisions 168615 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r168615 | seanbright | 2009-01-14 15:58:26 -0500 (Wed, 14 Jan 2009) | 16 lines

  Merged revisions 168614 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r168614 | seanbright | 2009-01-14 15:52:00 -0500 (Wed, 14 Jan 2009) | 9 lines

    Update autosupport script to supply info for both Zaptel and DAHDI in 1.4 and
    be sure to run dahdi_test in 1.6.x and trunk instead of zttest.

    (closes issue #14132)
    Reported by: dsedivec
    Patches:
          asterisk-1.4-autosupport.patch uploaded by dsedivec (license 638)
          asterisk-trunk-autosupport.patch uploaded by dsedivec (license 638)
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168616 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/contrib/scripts/autosupport b/contrib/scripts/autosupport
index 3eeb706e011e1acc7b959404f51ea4c9837035f1..2fc975a545f07e6bd1b63897a7ae83417f87011c 100644 (file)
--- a/contrib/scripts/autosupport
+++ b/contrib/scripts/autosupport
@@ -67,7 +67,7 @@ if [ "$ans" = "y" ]; then
   uname -a >> $OUTPUT;
   echo >> $OUTPUT;
   echo >> $OUTPUT;
-  
+
   echo "------------------" >> $OUTPUT;
   echo "CPU INFO" >> $OUTPUT;
   echo "------------------" >> $OUTPUT;
@@ -106,7 +106,7 @@ if [ "$ans" = "y" ]; then
   modinfo /lib/modules/$(uname -r)/dahdi/*.ko >> $OUTPUT;
   echo >> $OUTPUT;
   echo >> $OUTPUT;
-  
+
   echo "------------------" >> $OUTPUT;
   echo "OTHER INFO" >> $OUTPUT;
   echo "------------------" >> $OUTPUT;
@@ -129,9 +129,9 @@ if [ "$ans" = "y" ]; then
   echo >> $OUTPUT;
 
   echo "------------------" >> $OUTPUT;
-  echo "ZTTEST" >> $OUTPUT;
+  echo "DAHDI_TEST" >> $OUTPUT;
   echo "------------------" >> $OUTPUT;
-  zttest -c 20 >> $OUTPUT;
+  dahdi_test -c 20 >> $OUTPUT;
   echo >> $OUTPUT;
   echo >> $OUTPUT;
 
@@ -212,7 +212,7 @@ if [ "$login" = "y" ]; then
   echo "Additional login info: "$adinfo >> $OUTPUT
 
   clear
-  echo 
+  echo
   echo "All information has been stored in $OUTPUT,"
   echo "Please attach this file to an email case you already"
   echo "have open with Digium Tech Support."
@@ -225,6 +225,3 @@ else
   echo "have open with Digium Tech Support."
 exit
 fi
-
-
-