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()