update configure

[bacula/bacula] / regress / scripts / cleanup-tape.in

diff --git a/regress/scripts/cleanup-tape.in b/regress/scripts/cleanup-tape.in
index ce996089c3df96acd89e8af7a731e89f4b610925..e08b12a854b3be6a53d31ccf41c9c835a45f16b1 100755 (executable)
--- a/regress/scripts/cleanup-tape.in
+++ b/regress/scripts/cleanup-tape.in
@@ -1,19 +1,29 @@
 #!/bin/sh
 #
-# Cleanup left over files -- both before and after test run
+# Cleanup left over files, then load $SLOT1 into drive and    
+#   write an EOF on it.
 #
 
 . scripts/functions
 
 scripts/cleanup
 
-if test "x@autochanger@" != "x/dev/null" ; then
-   a=`bin/@changer_script@ @autochanger@ loaded $SLOT1 @tape_drive@ 0`
-   if test $a = 0 ; then
-     bin/@changer_script@ @autochanger@ load $SLOT1 @tape_drive@ 0
-   fi
+# init slot for vtape driver
+init_slot @tape_drive@ $SLOT1
+
+if test x@autochanger@ != x/dev/null; then
+   slot=`$scripts/@changer_script@ @autochanger@ loaded 0 @tape_drive@ $DRIVE1`
+   case $slot in
+   0)
+      $scripts/@changer_script@ @autochanger@ load $SLOT1 @tape_drive@ $DRIVE1
+      ;;
+   $SLOT1)
+      ;;
+   *)
+      $scripts/@changer_script@ @autochanger@ unload $slot @tape_drive@ $DRIVE1
+      $scripts/@changer_script@ @autochanger@ load $SLOT1 @tape_drive@ $DRIVE1
+      ;;
+  esac
 fi
 
 init_drive @tape_drive@
-
-