kes Implement --without-qwt

[bacula/bacula] / bacula / scripts / mtx-changer.in

diff --git a/bacula/scripts/mtx-changer.in b/bacula/scripts/mtx-changer.in
index 1fe5f003bedc0f1f12ac757e903df5d8495ed482..1dbc5b410f66dd3fcee010b28e7acf2675c945d4 100644 (file)
--- a/bacula/scripts/mtx-changer.in
+++ b/bacula/scripts/mtx-changer.in
@@ -52,6 +52,10 @@ MTX=@MTX@
 # SunOS     No Additional Sense
 # FreeBSD   Current Driver State: at rest.
 # Linux     ONLINE
+#  Note Debian has a different mt than the standard Linux version. 
+#    When no tape is in the drive it waits 2 minutes.  
+#    When a tape is in the drive, it prints user unfriendly output.
+#
 
 OS=`uname`
 case ${OS} in
@@ -61,8 +65,12 @@ case ${OS} in
   FreeBSD)
     ready="Current Driver State: at rest."
     ;;
-  *)
-    ready="ONLINE"
+  Linux)
+    if test -e /etc/debian_version ; then
+       ready="drive status"
+    else
+       ready="ONLINE"
+    fi
   ;;
 esac
 
@@ -108,7 +116,7 @@ make_temp_file() {
 wait_for_drive() {
   i=0 
   while [ $i -le 300 ]; do  # Wait max 300 seconds
-    if mt -f $1 status | grep ${ready} >/dev/null 2>&1; then
+    if mt -f $1 status 2>&1 | grep "${ready}" >/dev/null 2>&1; then
       break
     fi
     debug "Device $1 - not ready, retrying..."
@@ -124,7 +132,7 @@ check_parm_count() {
     pCountNeed=$2
     if test $pCount -lt $pCountNeed; then
        echo "usage: mtx-changer ctl-device command [slot archive-device drive-index]"
-       echo "  Insufficient number of arguments arguments given."
+       echo "  Insufficient number of arguments given."
        if test $pCount -lt 2; then
            echo "  Mimimum usage is first two arguments ..."
        else