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

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

diff --cc docs/TRANSIENT-SETTINGS.md
Simple merge

diff --cc src/core/load-fragment-gperf.gperf.m4
Simple merge

diff --cc src/core/scope.c
index 094c8979a8ea879791094457092106b251236f21,874511c98cb7f9e9b67142915d3112d134512bcf..e8cfedb0d49930eab599ca35907ceae8e7528f3c
--- 1/src/core/scope.c
--- 2/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);
  }
  

diff --cc src/login/pam_systemd.c
Simple merge

diff --cc src/shared/bus-unit-util.c
Simple merge