Re: [PATCH] common/encrypt: Create an encrypted equivalent of _scratch_mkfs_sized

Dave Chinner
2017-12-21T01:39:12Z

On Wed, Dec 20, 2017 at 07:46:40PM +0200, Ari Sundholm wrote:
> Test case generic/399 hardcodes "-O encrypt" in MKFS_OPTIONS when
> calling _scratch_mkfs_sized, which only works with the mkfs of certain
> filesystems. Create a new helper, _scratch_mkfs_sized_encrypted, for
> handling the differences between the mkfs tools of different
> filesystems. It also allows those filesystems whose mkfs doesn't accept
> "-O encrypt" to skip the test gracefully until proper support is added
> for them in the helper.
>
> Signed-off-by: Ari Sundholm <ari@tuxera.com>
> ---
> common/encrypt | 12 ++++++++++++
> tests/generic/399 | 3 +--
> 2 files changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/common/encrypt b/common/encrypt
> index a6fd89d..189c59e 100644
> --- a/common/encrypt
> +++ b/common/encrypt
> @@ -81,6 +81,18 @@ _scratch_mkfs_encrypted()
> esac
> }
>
> +_scratch_mkfs_sized_encrypted()
> +{
> + case $FSTYP in
> + ext4|f2fs)
> + MKFS_OPTIONS="$MKFS_OPTIONS -O encrypt" _scratch_mkfs_sized $*
> + ;;

This does not need to screw around with MKFS_OPTIONS. This:

_scratch_mkfs_sized -O encrypt $*

Will do just fine.

Also, _scratch_mkfs_encrypted() supports UBIFS, and this new
function doesn't. Seems like it should to me...

Cheers,

Dave.
--
Dave Chinner
david@fromorbit.com