From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 28 Oct 2019 13:57:00 +0000 (+0100)
Subject: Merge pull request #13423 from pwithnall/12035-session-time-limits
X-Git-Tag: v244-rc1~146
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a5f6f346d3db9061fa73527e9dba3fa6b1d80b69;p=thirdparty%2Fsystemd.git

Merge pull request #13423 from pwithnall/12035-session-time-limits

Add `RuntimeMaxSec=` support to scope units (time-limited login sessions)
---

a5f6f346d3db9061fa73527e9dba3fa6b1d80b69
diff --cc src/core/scope.c
index 094c8979a8e,874511c98cb..e8cfedb0d49
--- a/src/core/scope.c
+++ b/src/core/scope.c
@@@ -236,11 -247,13 +253,13 @@@ static void scope_dump(Unit *u, FILE *f
  
          fprintf(f,
                  "%sScope State: %s\n"
-                 "%sResult: %s\n",
+                 "%sResult: %s\n"
+                 "%sRuntimeMaxSec: %s\n",
                  prefix, scope_state_to_string(s->state),
-                 prefix, scope_result_to_string(s->result));
+                 prefix, scope_result_to_string(s->result),
+                 prefix, format_timespan(buf_runtime, sizeof(buf_runtime), s->runtime_max_usec, USEC_PER_SEC));
  
 -        cgroup_context_dump(&s->cgroup_context, f, prefix);
 +        cgroup_context_dump(UNIT(s), f, prefix);
          kill_context_dump(&s->kill_context, f, prefix);
  }