chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
coredump: collect all /proc data useful for bug reporting
[elogind.git]
/
src
/
cryptsetup
/
cryptsetup-generator.c
diff --git
a/src/cryptsetup/cryptsetup-generator.c
b/src/cryptsetup/cryptsetup-generator.c
index 05ceff443fe1dc80529dd6452230e77de472a28d..7c79ca35615fbdcc6e081079e9d92ef3ee456b3f 100644
(file)
--- a/
src/cryptsetup/cryptsetup-generator.c
+++ b/
src/cryptsetup/cryptsetup-generator.c
@@
-308,7
+308,7
@@
int main(int argc, char *argv[]) {
_cleanup_strv_free_ char **disks_done = NULL;
_cleanup_fclose_ FILE *f = NULL;
unsigned n = 0;
_cleanup_strv_free_ char **disks_done = NULL;
_cleanup_fclose_ FILE *f = NULL;
unsigned n = 0;
- int r = EXIT_FAILURE, r2 = EXIT_FAILURE;
+ int r = EXIT_FAILURE, r2 = EXIT_FAILURE
, z
;
char **i;
if (argc > 1 && argc != 4) {
char **i;
if (argc > 1 && argc != 4) {
@@
-325,8
+325,9
@@
int main(int argc, char *argv[]) {
umask(0022);
umask(0022);
- if (parse_proc_cmdline(parse_proc_cmdline_item) < 0)
- goto cleanup;
+ z = parse_proc_cmdline(parse_proc_cmdline_item);
+ if (z < 0)
+ log_warning("Failed to parse kernel command line, ignoring: %s", strerror(-z));
if (!arg_enabled) {
r = r2 = EXIT_SUCCESS;
if (!arg_enabled) {
r = r2 = EXIT_SUCCESS;
@@
-381,7
+382,7
@@
int main(int argc, char *argv[]) {
}
/*
}
/*
- If options are specified on the kernel commandline, let them override
+ If options are specified on the kernel command
line, let them override
the ones from crypttab.
*/
STRV_FOREACH(i, arg_options) {
the ones from crypttab.
*/
STRV_FOREACH(i, arg_options) {
@@
-463,7
+464,7
@@
next:
if (arg_options) {
/*
if (arg_options) {
/*
- If options are specified on the kernel commandline, use them.
+ If options are specified on the kernel command
line, use them.
*/
char **j;
*/
char **j;