From: David Disseldorp <ddiss@sgi.com>
Date: Mon, 16 Oct 2006 06:14:00 +0000 (+0000)
Subject: moved _mount_ops_minus_o_comma_replace to _mount routine, to filter all mount request... 
X-Git-Tag: v1.1.0~567
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=bf1f86644be59336e2a692ecb6f67f9ccf68b228;p=xfstests-dev.git

moved _mount_ops_minus_o_comma_replace to _mount routine, to filter all mount requests for multiple -o's
Merge of master-melb:xfs-cmds:27199a by kenmcd.
---

diff --git a/common.rc b/common.rc
index ab8f6416..7034e9a6 100644
--- 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()