From 5365be3f59855e0795d9c7c52228e1763b3f734f Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sun, 26 Apr 2009 20:47:43 +0000 Subject: [PATCH] Fix init and cleanup of vtape git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8752 91ce42f0-d328-0410-95d8-f526ca767f89 --- regress/scripts/cleanup | 4 ++++ regress/scripts/functions | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/regress/scripts/cleanup b/regress/scripts/cleanup index 7dc85ccfd7..6cb2bd09aa 100755 --- 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 31cf92bb11..a3cfe744c0 100644 --- 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 <