summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-10-28 14:57:00 +0100
committerGitHub <noreply@github.com>2019-10-28 14:57:00 +0100
commita5f6f346d3db9061fa73527e9dba3fa6b1d80b69 (patch)
tree924f5d0a1832be95944d64183fd51e5d31d2aabc /man
parentfec837e96e902c041adae552aa3101b8a8132869 (diff)
parentadc09af234047126b5ed65869d575c99dec3f9cc (diff)
downloadsystemd-a5f6f346d3db9061fa73527e9dba3fa6b1d80b69.tar.gz
Merge pull request #13423 from pwithnall/12035-session-time-limits
Add `RuntimeMaxSec=` support to scope units (time-limited login sessions)
Diffstat (limited to 'man')
-rw-r--r--man/pam_systemd.xml7
-rw-r--r--man/systemd.scope.xml25
2 files changed, 32 insertions, 0 deletions
diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml
index fd8e4fb773..d5be98e4c0 100644
--- a/man/pam_systemd.xml
+++ b/man/pam_systemd.xml
@@ -263,6 +263,12 @@
<listitem><para>Sets unit <varname>IOWeight=</varname>.</para></listitem>
</varlistentry>
+
+ <varlistentry>
+ <term><varname>systemd.runtime_max_sec</varname></term>
+
+ <listitem><para>Sets unit <varname>RuntimeMaxSec=</varname>.</para></listitem>
+ </varlistentry>
</variablelist>
<para>Example data as can be provided from an another PAM module:
@@ -271,6 +277,7 @@ pam_set_data(handle, "systemd.memory_max", (void *)"200M", cleanup);
pam_set_data(handle, "systemd.tasks_max", (void *)"50", cleanup);
pam_set_data(handle, "systemd.cpu_weight", (void *)"100", cleanup);
pam_set_data(handle, "systemd.io_weight", (void *)"340", cleanup);
+pam_set_data(handle, "systemd.runtime_max_sec", (void *)"3600", cleanup);
</programlisting>
</para>
diff --git a/man/systemd.scope.xml b/man/systemd.scope.xml
index 503a480dd0..daf3554db2 100644
--- a/man/systemd.scope.xml
+++ b/man/systemd.scope.xml
@@ -78,6 +78,31 @@
</refsect1>
<refsect1>
+ <title>Options</title>
+
+ <para>Scope files may include a <literal>[Scope]</literal>
+ section, which carries information about the scope and the
+ units it contains. A number of options that may be used in
+ this section are shared with other unit types. These options are
+ documented in
+ <citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+ and
+ <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
+ The options specific to the <literal>[Scope]</literal> section
+ of scope units are the following:</para>
+
+ <variablelist class='unit-directives'>
+ <varlistentry>
+ <term><varname>RuntimeMaxSec=</varname></term>
+
+ <listitem><para>Configures a maximum time for the scope to run. If this is used and the scope has been
+ active for longer than the specified time it is terminated and put into a failure state. Pass
+ <literal>infinity</literal> (the default) to configure no runtime limit.</para></listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+ <refsect1>
<title>See Also</title>
<para>
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,