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:43:07 +0200
commitd3ba57d9522a9952740b71ef631065caa7df7cbe (patch)
tree4445bc25d6ddcda30afd4729a10ac0204700598c
parent5d01937fd64b225be982fbff150ccf24360005dc (diff)
downloadsystemd-d3ba57d9522a9952740b71ef631065caa7df7cbe.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) (cherry picked from commit 8d9471cbca46115e6411b78abc5bc67390940cf1) (cherry picked from commit e5715ab1c75a1b80c1a9a30f7d353b5fd09a93f2a)
-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 558e9510ff..42baeceb25 100644
--- a/src/veritysetup/veritysetup.c
+++ b/src/veritysetup/veritysetup.c
@@ -47,7 +47,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)