34 lines
1.0 KiB
Diff
34 lines
1.0 KiB
Diff
From 1ba4f74ed15a3b715eba0f21a12239af6e44146f Mon Sep 17 00:00:00 2001
|
|
From: David Tardon <dtardon@redhat.com>
|
|
Date: Thu, 30 May 2024 13:33:57 +0200
|
|
Subject: [PATCH] cryptsetup-generator: always process cmdline devices
|
|
|
|
(cherry picked from commit d181939e2e382631d9b067e0b4cfbf11b709a297)
|
|
|
|
Related: RHEL-127859
|
|
---
|
|
src/cryptsetup/cryptsetup-generator.c | 9 ++-------
|
|
1 file changed, 2 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
|
|
index 1136f5aed7..06292f7f73 100644
|
|
--- a/src/cryptsetup/cryptsetup-generator.c
|
|
+++ b/src/cryptsetup/cryptsetup-generator.c
|
|
@@ -925,14 +925,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);
|