public inbox for fstests@vger.kernel.org
 help / color / mirror / Atom feed
From: Eric Biggers <ebiggers3@gmail.com>
To: Theodore Ts'o <tytso@mit.edu>
Cc: fstests@vger.kernel.org, Eric Biggers <ebiggers@google.com>
Subject: [PATCH] xfstests-bld: use old key prefix in ext4 encrypt config
Date: Mon,  6 Feb 2017 13:42:35 -0800	[thread overview]
Message-ID: <20170206214237.8838-3-ebiggers3@gmail.com> (raw)

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

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
 }
 
-- 
2.11.0.483.g087da7b7c-goog


             reply	other threads:[~2017-02-06 21:44 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-06 21:42 Eric Biggers [this message]
2017-02-07 17:41 ` [PATCH] xfstests-bld: use old key prefix in ext4 encrypt config Theodore Ts'o

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170206214237.8838-3-ebiggers3@gmail.com \
    --to=ebiggers3@gmail.com \
    --cc=ebiggers@google.com \
    --cc=fstests@vger.kernel.org \
    --cc=tytso@mit.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox