update configure

[bacula/bacula] / regress / scripts / prepare-two-tapes.in

diff --git a/regress/scripts/prepare-two-tapes.in b/regress/scripts/prepare-two-tapes.in
index 65bcce823cc96b88122102e1e4186c59dfe70eb6..5d06bdca463e8ec4827ed5f29cb202a6617127c9 100755 (executable)
--- a/regress/scripts/prepare-two-tapes.in
+++ b/regress/scripts/prepare-two-tapes.in
@@ -8,39 +8,49 @@
 
 scripts/cleanup
 
+
+# with disk-changer, we have to initialize slots
+init_slot @tape_drive@ $SLOT1
+init_slot @tape_drive@ $SLOT2
+
 #
 # init first of two slots
 # optimize so we don't unnecessarily unload and load slots
 #
 if test x@autochanger@ != x/dev/null; then
-   slot=`bin/@changer_script@ @autochanger@ loaded 0 @tape_drive@ $DRIVE1`
+   slot=`$scripts/@changer_script@ @autochanger@ loaded 0 @tape_drive@ $DRIVE1`
    case $slot in
    0)
-      bin/@changer_script@ @autochanger@ load $SLOT1 @tape_drive@ $DRIVE1
-      init_drive @tape_drive@
+      $scripts/@changer_script@ @autochanger@ load $SLOT1 @tape_drive@ $DRIVE1
       slot=$SLOT1
       ;;
    $SLOT1)
-      init_drive @tape_drive@
       slot=$SLOT1
       ;;
    $SLOT2)
-      init_drive @tape_drive@
       slot=$SLOT2
       ;;
+   *)
+      $scripts/@changer_script@ @autochanger@ unload $slot @tape_drive@ $DRIVE1
+      $scripts/@changer_script@ @autochanger@ load $SLOT1 @tape_drive@ $DRIVE1
+      slot=$SLOT1
+      ;;
   esac
+  init_drive @tape_drive@
+  $scripts/@changer_script@ @autochanger@ unload $slot @tape_drive@ $DRIVE1
+
 
 # init the other slot
   case $slot in
    $SLOT1)
-      bin/@changer_script@ @autochanger@ unload $slot @tape_drive@ $DRIVE1
-      bin/@changer_script@ @autochanger@ load $SLOT2 @tape_drive@ $DRIVE1
-      init_drive @tape_drive@
+      $scripts/@changer_script@ @autochanger@ load $SLOT2 @tape_drive@ $DRIVE1
       ;;
    $SLOT2)
-      bin/@changer_script@ @autochanger@ unload $slot @tape_drive@ $DRIVE1
-      bin/@changer_script@ @autochanger@ load $SLOT1 @tape_drive@ $DRIVE1
-      init_drive @tape_drive@
+      $scripts/@changer_script@ @autochanger@ load $SLOT1 @tape_drive@ $DRIVE1
       ;;
+   *)
+      echo "Something went wrong. Expected $SLOT1 or $SLOT2, got $slot"
+      exit 1
    esac
+   init_drive @tape_drive@
 fi