Merge pull request #6832 from poettering/keyring-mode

Add KeyringMode unit property to fix cryptsetup key caching

diff --cc man/systemd.exec.xml
Simple merge

diff --cc src/core/execute.c
index 9e1add3,825a0f9..094bb6f
--- 1/src/core/execute.c
--- 2/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;
          }