From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 5 Oct 2018 20:37:37 +0000 (+0200)
Subject: cryptsetup: don't use %m if there's no error to show
X-Git-Tag: v240~621^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2abe64666e544be6499f870618185f8819b4c152;p=thirdparty%2Fsystemd.git

cryptsetup: don't use %m if there's no error to show

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.
---

diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index 24ccf042734..6c4aabe57db 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -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)