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:42:23 +0200
commit0715ab1c75a1b80c1a9a30f7d353b5fd09a93f2a (patch)
treeb4716b6aa6f977097ef93c21570ab71d9cdda981
parent99236971acc52455df51226996fbe71ecedc2f6f (diff)
downloadsystemd-0715ab1c75a1b80c1a9a30f7d353b5fd09a93f2a.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 5e5923f272682476c053e5afd705e0f6b4595cbf)
-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 2b54065437..5752ce8196 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)