diff mbox

xfstests-bld: use old key prefix in ext4 encrypt config

Message ID 20170206214237.8838-3-ebiggers3@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Eric Biggers Feb. 6, 2017, 9:42 p.m. UTC 
From: Eric Biggers <ebiggers@google.com>

For the ext4 encrypt config, add the dummy key using the "ext4:" prefix
instead of the "fscrypt:" prefix.  This will allow xfstests-bld to test
any old kernels to which the change to make test_dummy_encryption
require a keyring key may get backported.  (Of course, it also remains
able to test old kernels to which that change has *not* been
backported.)  Using the old / fs-specific key prefix is also consistent
with the xfstests in the "encrypt" group, which use the fs-specific key
prefix to allow the tests to run unmodified on older kernels.

Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 kvm-xfstests/test-appliance/files/root/fs/ext4/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Theodore Ts'o Feb. 7, 2017, 5:41 p.m. UTC | #1 
On Mon, Feb 06, 2017 at 01:42:35PM -0800, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
> 
> For the ext4 encrypt config, add the dummy key using the "ext4:" prefix
> instead of the "fscrypt:" prefix.  This will allow xfstests-bld to test
> any old kernels to which the change to make test_dummy_encryption
> require a keyring key may get backported.  (Of course, it also remains
> able to test old kernels to which that change has *not* been
> backported.)  Using the old / fs-specific key prefix is also consistent
> with the xfstests in the "encrypt" group, which use the fs-specific key
> prefix to allow the tests to run unmodified on older kernels.
> 
> Signed-off-by: Eric Biggers <ebiggers@google.com>

Thanks, applied.

					- Ted
--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/kvm-xfstests/test-appliance/files/root/fs/ext4/config b/kvm-xfstests/test-appliance/files/root/fs/ext4/config
index 86840e0..9fde22c 100644
--- a/kvm-xfstests/test-appliance/files/root/fs/ext4/config
+++ b/kvm-xfstests/test-appliance/files/root/fs/ext4/config
@@ -46,7 +46,7 @@  function setup_mount_opts()
         fi
         local key="${mode}${raw}${size}"
         keyctl new_session
-        echo -n -e "${key}" | keyctl padd logon fscrypt:4242424242424242 @s
+        echo -n -e "${key}" | keyctl padd logon ext4:4242424242424242 @s
     fi
 }