Tweak

[bacula/bacula] / regress / scripts / cleanup-2drive.in

diff --git a/regress/scripts/cleanup-2drive.in b/regress/scripts/cleanup-2drive.in
index a4ff193dd89f6663af8c4027c7ceb550e07940ee..e6fa40e99716d1f0d8c00cca1ab8ed3f340076c8 100755 (executable)
--- 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/mtx-changer @autochanger@ loaded 0 @tape_drive1@ 1`
+   slot=`bin/@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/mtx-changer @autochanger@ unload $slot @tape_drive1@ 1
+      bin/@changer_script@ @autochanger@ unload $slot @tape_drive1@ 1
    fi
-   slot=`bin/mtx-changer @autochanger@ loaded 0 @tape_drive@ 0`
+   slot=`bin/@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/mtx-changer @autochanger@ unload $slot @tape_drive@ 0
+      bin/@changer_script@ @autochanger@ unload $slot @tape_drive@ 0
    fi
 
 
-   slot=`bin/mtx-changer @autochanger@ loaded 0 @tape_drive1@ 1`
+   slot=`bin/@changer_script@ @autochanger@ loaded 0 @tape_drive1@ 1`
    if test x$slot != x$SLOT2; then
       echo "load slot $SLOT2 in drive 1"
-      bin/mtx-changer @autochanger@ load $SLOT2 @tape_drive1@ 1
+      bin/@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/mtx-changer @autochanger@ unload $SLOT2 @tape_drive1@ 1
+   bin/@changer_script@ @autochanger@ unload $SLOT2 @tape_drive1@ 1
 
-   slot=`bin/mtx-changer @autochanger@ loaded 0 @tape_drive@ 0`
+   slot=`bin/@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/mtx-changer @autochanger@ load $SLOT1 @tape_drive@ 0
+      bin/@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/mtx-changer @autochanger@ unload $SLOT1 @tape_drive@ 0
+   bin/@changer_script@ @autochanger@ unload $SLOT1 @tape_drive@ 0
 fi