overlay/041: use user defined overlay mount option

[xfstests-dev.git] / soak

diff --git a/soak b/soak
index 5e0d9647f8f2b112543cb184db76b66d8aa8afb0..ec4fbb53ba1b23dfa7ef7efe7407ff5453454361 100755 (executable)
--- a/soak
+++ b/soak
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash

 #-----------------------------------------------------------------------
 # Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
 #
 #-----------------------------------------------------------------------
 # Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
 #


@@ -17,12 +17,10 @@
 #
 #-----------------------------------------------------------------------
 #
 #
 #-----------------------------------------------------------------------
 #

-# creator
-owner=dxm@sgi.com

 
 # get standard environment, filters and checks
 
 # get standard environment, filters and checks

-. ./common.rc
-. ./common.filter
+. ./common/rc
+. ./common/filter

 
 tmp=/tmp/$$
 seq=soak
 
 tmp=/tmp/$$
 seq=soak


@@ -31,7 +29,7 @@ status=1      # failure is the default!
 _cleanup()
 {
     echo "        *** umount"
 _cleanup()
 {
     echo "        *** umount"

-    umount $SCRATCH_DEV >/dev/null 2>&1
+    _scratch_unmount >/dev/null 2>&1

 }
 
 trap "_cleanup; exit \$status" 0 1 2 3 15
 }
 
 trap "_cleanup; exit \$status" 0 1 2 3 15


@@ -87,7 +85,7 @@ _log "***     (`date`)"
 _log "    *** init"
 _log "        *** unmounting scratch device"
 
 _log "    *** init"
 _log "        *** unmounting scratch device"
 

-umount $SCRATCH_DEV 2>&1 |  _fix_malloc >>$FULL
+_scratch_unmount 2>&1 |  _fix_malloc >>$FULL

 
 _log "        *** clean scratch device"
 
 
 _log "        *** clean scratch device"
 


@@ -130,7 +128,7 @@ do
 
     _log "        *** unmounting scratch device"
 
 
     _log "        *** unmounting scratch device"
 

-    umount $SCRATCH_DEV 2>&1 | _logp \
+    _scratch_unmount 2>&1 | _logp \

                             || _fail "            !!! failed to umount"
     
     let "pass = pass + 1"
                             || _fail "            !!! failed to umount"
     
     let "pass = pass + 1"