From: Eric Biggers <ebiggers@kernel.org>
To: fstests@vger.kernel.org
Cc: linux-fscrypt@vger.kernel.org, keyrings@vger.kernel.org
Subject: [PATCH v2 1/3] common/rc: handle option with argument in _require_xfs_io_command()
Date: Mon, 3 Feb 2020 10:18:53 -0800 [thread overview]
Message-ID: <20200203181855.42987-2-ebiggers@kernel.org> (raw)
In-Reply-To: <20200203181855.42987-1-ebiggers@kernel.org>
From: Eric Biggers <ebiggers@google.com>
Fix _require_xfs_io_command() to handle options that take arguments when
the argument is shown in the help text. E.g., it didn't work to run:
_require_xfs_io_command "add_enckey" "-k"
because the relevant line of the help text is:
-k KEY_ID -- ID of fscrypt-provisioning key containing the raw key
... but the grep command only matched "-k --", not "-k KEY_ID --".
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
common/rc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/rc b/common/rc
index b4a77a21..0306e93c 100644
--- a/common/rc
+++ b/common/rc
@@ -2248,7 +2248,7 @@ _require_xfs_io_command()
[ -n "$param" ] || return
if [ -z "$param_checked" ]; then
- $XFS_IO_PROG -c "help $command" | grep -q "^ $param --" || \
+ $XFS_IO_PROG -c "help $command" | grep -E -q "^ $param ([a-zA-Z_]+ )?--" || \
_notrun "xfs_io $command doesn't support $param"
else
# xfs_io could result in "command %c not supported" if it was
--
2.25.0.341.g760bfbb309-goog
next prev parent reply other threads:[~2020-02-03 18:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-03 18:18 [PATCH v2 0/3] xfstests: test adding filesystem-level fscrypt key via key_id Eric Biggers
2020-02-03 18:18 ` Eric Biggers [this message]
2020-02-03 18:18 ` [PATCH v2 2/3] common/encrypt: move constant test key to common code Eric Biggers
2020-02-03 18:18 ` [PATCH v2 3/3] generic: test adding filesystem-level fscrypt key via key_id Eric Biggers
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=20200203181855.42987-2-ebiggers@kernel.org \
--to=ebiggers@kernel.org \
--cc=fstests@vger.kernel.org \
--cc=keyrings@vger.kernel.org \
--cc=linux-fscrypt@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).