[PATCH] common/rc: allow setting $SCRATCH_FS_MOUNT_OPTS

[PATCH] common/rc: allow setting $SCRATCH_FS_MOUNT_OPTS

[Jeff Layton]

We already have a $TEST_FS_MOUNT_OPTS which gets applied only to the
test mount, but we don't have a corresponding variable for the scratch
mount. Add one.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
 common/rc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/rc b/common/rc
index 65ebfe201139..23874d1e5b8e 100644
--- a/common/rc
+++ b/common/rc
@@ -308,7 +308,7 @@ _scratch_mount_options()
 {
 	_scratch_options mount
 
-	echo `_common_dev_mount_options $*` $SCRATCH_OPTIONS \
+	echo `_common_dev_mount_options $*` $SCRATCH_OPTIONS $SCRATCH_FS_MOUNT_OPTS \
 					$SCRATCH_DEV $SCRATCH_MNT
 }
 
-- 
2.28.0

Re: [PATCH] common/rc: allow setting $SCRATCH_FS_MOUNT_OPTS

[Eryu Guan]

On Thu, Nov 05, 2020 at 10:09:36AM -0500, Jeff Layton wrote:
> We already have a $TEST_FS_MOUNT_OPTS which gets applied only to the
> test mount, but we don't have a corresponding variable for the scratch
> mount. Add one.

MOUNT_OPTIONS is used for the scratch mount, and
_common_dev_mount_options includes it. Would you please confirm if that
works for you?

Thanks,
Eryu

> 
> Signed-off-by: Jeff Layton <jlayton@kernel.org>
> ---
>  common/rc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/common/rc b/common/rc
> index 65ebfe201139..23874d1e5b8e 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -308,7 +308,7 @@ _scratch_mount_options()
>  {
>  	_scratch_options mount
>  
> -	echo `_common_dev_mount_options $*` $SCRATCH_OPTIONS \
> +	echo `_common_dev_mount_options $*` $SCRATCH_OPTIONS $SCRATCH_FS_MOUNT_OPTS \
>  					$SCRATCH_DEV $SCRATCH_MNT
>  }
>  
> -- 
> 2.28.0

Re: [PATCH] common/rc: allow setting $SCRATCH_FS_MOUNT_OPTS

[Jeff Layton]

On Sun, 2020-11-08 at 14:37 +0800, Eryu Guan wrote:
> On Thu, Nov 05, 2020 at 10:09:36AM -0500, Jeff Layton wrote:
> > We already have a $TEST_FS_MOUNT_OPTS which gets applied only to the
> > test mount, but we don't have a corresponding variable for the scratch
> > mount. Add one.
> 
> MOUNT_OPTIONS is used for the scratch mount, and
> _common_dev_mount_options includes it. Would you please confirm if that
> works for you?
> 
> Thanks,
> Eryu
> 

Yes, it does. I had had a problem with that at one point, but I don't
currently recall what it was. In any case, feel free to drop this one.

Thanks,
Jeff

> > Signed-off-by: Jeff Layton <jlayton@kernel.org>
> > ---
> >  common/rc | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/common/rc b/common/rc
> > index 65ebfe201139..23874d1e5b8e 100644
> > --- a/common/rc
> > +++ b/common/rc
> > @@ -308,7 +308,7 @@ _scratch_mount_options()
> >  {
> >  	_scratch_options mount
> >  
> > 
> > 
> > 
> > -	echo `_common_dev_mount_options $*` $SCRATCH_OPTIONS \
> > +	echo `_common_dev_mount_options $*` $SCRATCH_OPTIONS $SCRATCH_FS_MOUNT_OPTS \
> >  					$SCRATCH_DEV $SCRATCH_MNT
> >  }
> >  
> > 
> > 
> > 
> > -- 
> > 2.28.0

-- 
Jeff Layton <jlayton@kernel.org>