Fix init and cleanup of vtape

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8752 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/regress/scripts/cleanup b/regress/scripts/cleanup
index 7dc85ccfd7caca1176b13ddcfd22f66f436f195d..6cb2bd09aae2a615b1b03422014ebd4a476fdcdd 100755 (executable)
--- a/regress/scripts/cleanup
+++ b/regress/scripts/cleanup
@@ -24,3 +24,7 @@ then
   ./grant_bacula_privileges >/dev/null 2>&1
   cd ..
 fi
+
+if [ x$USE_VTAPE = xyes ]; then
+   rm -rf working/ach
+fi

diff --git a/regress/scripts/functions b/regress/scripts/functions
index 31cf92bb11fa6b5e1161aa34ccacb8eb10e670d4..a3cfe744c0b0ab3ee3fde63de695cd34c8861361 100644 (file)
--- a/regress/scripts/functions
+++ b/regress/scripts/functions
@@ -454,15 +454,17 @@ if [ x$USE_VTAPE = xyes ]; then
    mkdir -p $working/ach
    SLOT1=1
    SLOT2=2
-   TAPE_DRIVE=$working/ach/drive1
+   TAPE_DRIVE=$working/ach/drive0
    TAPE_DRIVE1=$working/ach/drive1
    AUTOCHANGER=$working/ach/config
    AUTOCHANGER_SCRIPT=disk-changer
    DRIVE1=0
    DRIVE2=1
+   cp /dev/null $working/ach/slot$SLOT1
+   cp /dev/null $working/ach/slot$SLOT2
    cat > $AUTOCHANGER <<EOF
-maxdrive=2
-maxslot=60
+maxdrive=8
+maxslot=80
 EOF
 fi