summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2021-07-31 09:00:11 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2021-08-06 16:40:58 +0200
commit5e5923f272682476c053e5afd705e0f6b4595cbf (patch)
treee48142eb603f79820be63c33406d9eca98f3a13d
parentfba9fd963bb3b5fafdb123788b3fabe6ed0830c9 (diff)
downloadsystemd-5e5923f272682476c053e5afd705e0f6b4595cbf.tar.gz
veritysetup: print help for --help/-h/help
In general our commands print help on --help, but here this would trigger the error that two arguments are needed. Let's make this more user-friendly. (cherry picked from commit 5d5e43cc33637a12f743f17294cfbd3ede08a1b3)
-rw-r--r--src/veritysetup/veritysetup.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/veritysetup/veritysetup.c b/src/veritysetup/veritysetup.c
index 34208dcd87..14d7462ddb 100644
--- a/src/veritysetup/veritysetup.c
+++ b/src/veritysetup/veritysetup.c
@@ -130,7 +130,10 @@ static int run(int argc, char *argv[]) {
_cleanup_(crypt_freep) struct crypt_device *cd = NULL;
int r;
- if (argc <= 1)
+ if (argc <= 1 ||
+ strv_contains(strv_skip(argv, 1), "--help") ||
+ strv_contains(strv_skip(argv, 1), "-h") ||
+ streq(argv[1], "help"))
return help();
if (argc < 3)