From: David Tardon <dtardon@redhat.com>
Date: Thu, 30 May 2024 11:33:57 +0000 (+0200)
Subject: cryptsetup-generator: always process cmdline devices
X-Git-Tag: v257-rc1~1175^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F33100%2Fhead;p=thirdparty%2Fsystemd.git

cryptsetup-generator: always process cmdline devices
---

diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index 56350b9b128..6a3ff961fc8 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -939,14 +939,9 @@ static int run(const char *dest, const char *dest_early, const char *dest_late)
                 return 0;
 
         r = add_crypttab_devices();
-        if (r < 0)
-                return r;
-
-        r = add_proc_cmdline_devices();
-        if (r < 0)
-                return r;
+        RET_GATHER(r, add_proc_cmdline_devices());
 
-        return 0;
+        return r;
 }
 
 DEFINE_MAIN_GENERATOR_FUNCTION(run);