Imported Debian patch 2.5.1p3-1

[debian/amanda] / changer-src / chg-zd-mtx.sh.in

diff --git a/changer-src/chg-zd-mtx.sh.in b/changer-src/chg-zd-mtx.sh.in
index 52e750d18c284de18a6cf0d0b0f63aa30cb5ecbd..620d348fdae3aa05a8eeffaeb34d69175b00f8f3 100644 (file)
--- a/changer-src/chg-zd-mtx.sh.in
+++ b/changer-src/chg-zd-mtx.sh.in
@@ -68,6 +68,7 @@
 #            Storage Element 7:Full :VolumeTag=SR0007
 #            Storage Element 8:Full :VolumeTag=SR0008
 #            Storage Element 9:Full :VolumeTag=SR0009
+#            Storage Element 10 IMPORT/EXPORT:Full :VolumeTag=SR0009
 #
 #     This says the first storage slot (element) is "1" and the last
 #     is "9".  If you allocate the entire robot to Amanda, you do not need
@@ -504,6 +505,14 @@ get_loaded_info() {
        s/.*Storage Element \([0-9][0-9]*\):Full/-2/p
         q
     }
+    /^.*Storage Element '$currentslot' IMPORT\/EXPORT:Empty/ {
+       s/.*Storage Element \([0-9][0-9]*\) IMPORT\/EXPORT:Empty/\1/p
+        q
+    }
+    /^.*Storage Element '$currentslot' IMPORT\/EXPORT:Full/ {
+       s/.*Storage Element \([0-9][0-9]*\) IMPORT\/EXPORT:Full/-2/p
+        q
+    }
 }
 ' < $mtx_status 2>& 1`
                shift                           # get rid of the "x"
@@ -521,6 +530,10 @@ get_loaded_info() {
        s/.*Storage Element \([0-9][0-9]*\):Empty/\1/p
         q
     }
+    /^.*Storage Element \([0-9][0-9]*\) IMPORT\/EXPORT:Empty/ {
+       s/.*Storage Element \([0-9][0-9]*\) IMPORT\/EXPORT:Empty/\1/p
+        q
+    }
 }
 ' < $mtx_status 2>& 1`
                shift                           # get rid of the "x"
@@ -573,6 +586,9 @@ get_slot_list() {
 /^.*Storage Element \([0-9][0-9]*\):Full/ {
     s/.*Storage Element \([0-9][0-9]*\):Full.*/\1/p
 }
+/^.*Storage Element \([0-9][0-9]*\) IMPORT\/EXPORT:Full/ {
+    s/.*Storage Element \([0-9][0-9]*\) IMPORT\/EXPORT:Full.*/\1/p
+}
 ' < $mtx_status 2>&1 | grep -v "^${cleanslot}\$" | sort -n`
        slot_list=`echo $slot_list`             # remove the newlines
        if [ $firstslot -lt 0 -o $lastslot -lt 0 ]; then
@@ -669,6 +685,9 @@ elif [ $TAPE = "/dev/null" ]; then
 fi
 export TAPE                                    # for mtx command
 
+CHANGER=$TAPE
+export CHANGER                                 # for mtx command
+
 #### Set up the various config files.
 
 conf_match=`expr "$changerfile" : .\*\.conf\$`
@@ -690,6 +709,11 @@ labelfile=$changerfile-barcodes
 cleancount=`cat $cleanfile`
 accesscount=`cat $accessfile`
 
+test -z "$MT" && Exit 2 "<none>" "No mt command defined"
+test ! -f "$MT" && Exit 2 "<none>" "mt command ($MT) doesn't exist"
+test -z "$MTX" && Exit 2 "<none>" "No mtx command defined"
+test ! -f "$MTX" && Exit 2 "<none>" "mtx command ($MTX) doesn't exist"
+
 #### Dig out of the config file what is needed
 
 varlist=