mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
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.
This commit is contained in:
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user