]> git.apps.os.sepia.ceph.com Git - xfstests-dev.git/commitdiff
moved _mount_ops_minus_o_comma_replace to _mount routine, to filter all mount request...
authorDavid Disseldorp <ddiss@sgi.com>
Mon, 16 Oct 2006 06:14:00 +0000 (06:14 +0000)
committerDavid Disseldorp <ddiss@sgi.com>
Mon, 16 Oct 2006 06:14:00 +0000 (06:14 +0000)
Merge of master-melb:xfs-cmds:27199a by kenmcd.

common.rc

index ab8f641680a442d6b4c24b8fc85706ac755142c3..7034e9a62ccc02f588abce9d5590e25e54e16904 100644 (file)
--- a/common.rc
+++ b/common.rc
@@ -93,7 +93,7 @@ umask 022
 
 _mount()
 {
-    $MOUNT_PROG $*
+       $MOUNT_PROG `echo $* | _mount_ops_minus_o_comma_replace`
 }
 
 _scratch_options()
@@ -161,7 +161,7 @@ _mount_ops_minus_o_comma_replace()
 _scratch_mount_options()
 {
     _scratch_options mount
-    echo $SCRATCH_OPTIONS $MOUNT_OPTIONS $* $SCRATCH_DEV $SCRATCH_MNT | _mount_ops_minus_o_comma_replace
+    echo $SCRATCH_OPTIONS $MOUNT_OPTIONS $* $SCRATCH_DEV $SCRATCH_MNT
 }
 
 _scratch_mount()
@@ -172,7 +172,7 @@ _scratch_mount()
 _test_mount()
 {
     _test_options mount
-    _mount -t $FSTYP $(echo $TEST_OPTIONS $MOUNT_OPTIONS $* | _mount_ops_minus_o_comma_replace) $TEST_DEV $TEST_DIR
+    _mount -t $FSTYP $TEST_OPTIONS $MOUNT_OPTIONS $* $TEST_DEV $TEST_DIR
 }
 
 _scratch_mkfs_options()