cryptsetup: don't use %m if there's no error to show
authorLennart Poettering <lennart@poettering.net>
Fri, 5 Oct 2018 20:37:37 +0000 (22:37 +0200)
committerLukáš Nykrýn <lnykryn@redhat.com>
Tue, 11 Dec 2018 16:10:46 +0000 (17:10 +0100)
We are not the ones receiving an error here, but the ones generating it,
hence we shouldn't show it with %m, that's just confusing, as it
suggests we received an error from some other call.

(cherry-picked from commit 2abe64666e544be6499f870618185f8819b4c152)

Related: #1656869

src/cryptsetup/cryptsetup-generator.c

index 8c7a76e7892abfb26f9cd8736010c79f34bab266..52391bd185ff16ecbc6484f89a3068ee5e19562d 100644 (file)
@@ -152,8 +152,10 @@ static int create_disk(
                         return log_oom();
         }
 
-        if (keydev && !password)
-                return log_error_errno(-EINVAL, "Keydev is specified, but path to the password file is missing: %m");
+        if (keydev && !password) {
+                log_error("Key device is specified, but path to the password file is missing.");
+                return -EINVAL;
+        }
 
         r = generator_open_unit_file(arg_dest, NULL, n, &f);
         if (r < 0)