From: David Tardon <dtardon@redhat.com>
Date: Thu, 30 May 2024 11:32:20 +0000 (+0200)
Subject: cryptsetup-generator: parse all cmdline devices too
X-Git-Tag: v257-rc1~1175^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47c703d949e84997d11d657fade68064c04a46c8;p=thirdparty%2Fsystemd.git

cryptsetup-generator: parse all cmdline devices too
---

diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index 6016e7580b8..56350b9b128 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -884,7 +884,7 @@ static int add_crypttab_devices(void) {
 }
 
 static int add_proc_cmdline_devices(void) {
-        int r;
+        int r, ret = 0;
         crypto_device *d;
 
         HASHMAP_FOREACH(d, arg_disks) {
@@ -910,11 +910,10 @@ static int add_proc_cmdline_devices(void) {
                                 d->headerdev,
                                 d->options ?: arg_default_options,
                                 "/proc/cmdline");
-                if (r < 0)
-                        return r;
+                RET_GATHER(ret, r);
         }
 
-        return 0;
+        return ret;
 }
 
 DEFINE_PRIVATE_HASH_OPS_WITH_VALUE_DESTRUCTOR(crypt_device_hash_ops, char, string_hash_func, string_compare_func,