summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2018-05-07 21:17:09 +0200
committerLennart Poettering <lennart@poettering.net>2018-05-17 20:48:12 +0200
commit81f345dfed63b660ee7b31e0f3737995cf78470f (patch)
treef188263819719e4124697c11cc6dc2639f0050dc /man
parentc818eef1cdce45be65c9298a7d759c3d49c109c7 (diff)
downloadsystemd-81f345dfed63b660ee7b31e0f3737995cf78470f.tar.gz
systemd-81f345dfed63b660ee7b31e0f3737995cf78470f.tar.bz2
systemd-81f345dfed63b660ee7b31e0f3737995cf78470f.zip
nspawn: add a new --oom-score-adjust= command line switch
This is primarily useful in order to provide comprehensive OCI runtime compatibility with nspawn, but might have uses outside of it.
Diffstat (limited to 'man')
-rw-r--r--man/systemd-nspawn.xml10
-rw-r--r--man/systemd.nspawn.xml9
2 files changed, 19 insertions, 0 deletions
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 7f2b755eab..22bb3b705b 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -787,6 +787,16 @@
</varlistentry>
<varlistentry>
+ <term><option>--oom-score-adjust=</option></term>
+
+ <listitem><para>Changes the OOM ("Out Of Memory") score adjustment value for the container payload. This controls
+ <filename>/proc/self/oom_score_adj</filename> which influences the preference with which this container is
+ terminated when memory becomes scarce. For details see <citerefentry
+ project='man-pages'><refentrytitle>proc</refentrytitle><manvolnum>5</manvolnum></citerefentry>. Takes an
+ integer in the range -1000…1000.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><option>--kill-signal=</option></term>
<listitem><para>Specify the process signal to send to the container's PID 1 when nspawn itself receives
diff --git a/man/systemd.nspawn.xml b/man/systemd.nspawn.xml
index 436f8cd0e9..748a633a33 100644
--- a/man/systemd.nspawn.xml
+++ b/man/systemd.nspawn.xml
@@ -314,6 +314,15 @@
</varlistentry>
<varlistentry>
+ <term><varname>OOMScoreAdjust=</varname></term>
+
+ <listitem><para>Configures the OOM score adjustment value. This is equivalent to the
+ <option>--oom-score-adjust=</option> command line switch, and takes the same argument. See
+ <citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry> for
+ details.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><varname>Hostname=</varname></term>
<listitem><para>Configures the kernel hostname set for the container. This is equivalent to the