X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Fscripts%2Fcleanup-2drive.in;h=a0fbd6b08e21ce15a39c7e46fe5417d93c965d7f;hb=1461fd753573ad57a65139a80a614e3220047dbc;hp=a6c64911feeaef38fc5a1f3beb7953e4c38c5705;hpb=6ca1b97fdc7940b8eaa961bbefe17f92bab1bb20;p=bacula%2Fbacula

diff --git a/regress/scripts/cleanup-2drive.in b/regress/scripts/cleanup-2drive.in
index a6c64911fe..a0fbd6b08e 100755
--- a/regress/scripts/cleanup-2drive.in
+++ b/regress/scripts/cleanup-2drive.in
@@ -2,43 +2,44 @@
 #
 # Cleanup left over files -- both before and after test run
 #
+. scripts/functions
 scripts/cleanup
 
 if test x@autochanger@ != x/dev/null; then
-   slot=`bin/@changer_script@ @autochanger@ loaded 0 @tape_drive1@ 1`
+   slot=`$scripts/@changer_script@ @autochanger@ loaded 0 @tape_drive1@ 1`
    echo "Slot $slot in drive 1"
    if test x$slot != x0 ; then
       echo "unload slot $slot in drive 1"
-      bin/@changer_script@ @autochanger@ unload $slot @tape_drive1@ 1
+      $scripts/@changer_script@ @autochanger@ unload $slot @tape_drive1@ 1
    fi
-   slot=`bin/@changer_script@ @autochanger@ loaded 0 @tape_drive@ 0`
+   slot=`$scripts/@changer_script@ @autochanger@ loaded 0 @tape_drive@ 0`
    echo "Slot $slot in drive 0"
    if test x$slot != x0 ; then
       echo "unload slot $slot in drive 0"
-      bin/@changer_script@ @autochanger@ unload $slot @tape_drive@ 0
+      $scripts/@changer_script@ @autochanger@ unload $slot @tape_drive@ 0
    fi
 
 
-   slot=`bin/@changer_script@ @autochanger@ loaded 0 @tape_drive1@ 1`
+   slot=`$scripts/@changer_script@ @autochanger@ loaded 0 @tape_drive1@ 1`
    if test x$slot != x$SLOT2; then
       echo "load slot $SLOT2 in drive 1"
-      bin/@changer_script@ @autochanger@ load $SLOT2 @tape_drive1@ 1
+      $scripts/@changer_script@ @autochanger@ load $SLOT2 @tape_drive1@ 1
    fi
    echo "WEOF drive 1"
-   mt -f @tape_drive1@ rewind
-   mt -f @tape_drive1@ weof
+   init_drive @tape_drive1@
+
    echo "unload slot $SLOT2 in drive 1"
-   bin/@changer_script@ @autochanger@ unload $SLOT2 @tape_drive1@ 1
+   $scripts/@changer_script@ @autochanger@ unload $SLOT2 @tape_drive1@ 1
 
-   slot=`bin/@changer_script@ @autochanger@ loaded 0 @tape_drive@ 0`
+   slot=`$scripts/@changer_script@ @autochanger@ loaded 0 @tape_drive@ 0`
    echo "Slot $slot in drive 0"
    if test x$slot != x$SLOT1; then
       echo "load slot $SLOT1 in drive 0"
-      bin/@changer_script@ @autochanger@ load $SLOT1 @tape_drive@ 0
+      $scripts/@changer_script@ @autochanger@ load $SLOT1 @tape_drive@ 0
    fi
    echo "WEOF drive 0"
-   mt -f @tape_drive@ rewind
-   mt -f @tape_drive@ weof
+   init_drive @tape_drive@
+
    echo "unload slot $SLOT1 from drive 0"
-   bin/@changer_script@ @autochanger@ unload $SLOT1 @tape_drive@ 0
+   $scripts/@changer_script@ @autochanger@ unload $SLOT1 @tape_drive@ 0
 fi