X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcryptsetup%2Fcryptsetup-generator.c;h=c1f167a189ae58150c2ba958f88870c8c971d2b4;hb=0a1beeb64207eaa88ab9236787b1cbc2f704ae14;hp=05ceff443fe1dc80529dd6452230e77de472a28d;hpb=a6fb0dc138d4e7895f8e607493279dbe4df117a1;p=elogind.git

diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index 05ceff443..c1f167a18 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -255,7 +255,7 @@ static int create_disk(
                                   "# Automatically generated by systemd-cryptsetup-generator \n\n"
                                   "[Unit]\nJobTimeoutSec=0");
                 if (r < 0) {
-                        log_error("Failed to write device drop-in: %s", strerror(-r));
+                        log_error_errno(-r, "Failed to write device drop-in: %m");
                         return r;
                 }
         }
@@ -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;
-        int r = EXIT_FAILURE, r2 = EXIT_FAILURE;
+        int r = EXIT_FAILURE, r2 = EXIT_FAILURE, z;
         char **i;
 
         if (argc > 1 && argc != 4) {
@@ -325,8 +325,9 @@ int main(int argc, char *argv[]) {
 
         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_errno(-z, "Failed to parse kernel command line, ignoring: %m");
 
         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) {
@@ -463,7 +464,7 @@ next:
 
                 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;