From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 15 Sep 2017 19:24:48 +0000 (+0200)
Subject: Merge pull request #6832 from poettering/keyring-mode
X-Git-Tag: v235~94
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3d7d3cbbdafeb7910d86c386b7ba25c142d6b9ca;p=thirdparty%2Fsystemd.git

Merge pull request #6832 from poettering/keyring-mode

Add KeyringMode unit property to fix cryptsetup key caching
---

3d7d3cbbdafeb7910d86c386b7ba25c142d6b9ca
diff --cc src/core/execute.c
index 9e1add3e7f3,825a0f9468f..094bb6f7a75
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@@ -2717,10 -2764,9 +2776,10 @@@ static int exec_child
  
          (void) umask(context->umask);
  
-         r = setup_keyring(unit, params, uid, gid);
+         r = setup_keyring(unit, context, params, uid, gid);
          if (r < 0) {
                  *exit_status = EXIT_KEYRING;
 +                *error_message = strdup("Failed to set up kernel keyring");
                  return r;
          }