]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
cryptsetup-generator: always process cmdline devices 33100/head
authorDavid Tardon <dtardon@redhat.com>
Thu, 30 May 2024 11:33:57 +0000 (13:33 +0200)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 12 Jun 2024 09:46:39 +0000 (18:46 +0900)
src/cryptsetup/cryptsetup-generator.c

index 56350b9b1286b9c160233b78890d104b939d0537..6a3ff961fc8adbf11d7bb0773c260bcd7fa18382 100644 (file)
@@ -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);