File _service:tar_scm:backport-veritysetup-print-hel... of Package systemd

File _service:tar_scm:backport-veritysetup-print-help-for-help-h-help.patch of Package systemd (Revision e231d000eb6f8fe451999f66cf42d78d)

Currently displaying revision e231d000eb6f8fe451999f66cf42d78d , Show latest

From 5e5923f272682476c053e5afd705e0f6b4595cbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sat, 31 Jul 2021 09:00:11 +0200
Subject: [PATCH] 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)

Conflict:NA
Reference:https://github.com/systemd/systemd/commit/5e5923f272682476c053e5afd705e0f6b4595cbf
---
 src/veritysetup/veritysetup.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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