X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-nspawn.xml;h=7b6e673ba76f02146b9328f2f051856cc9cc1978;hb=5ad6091884425c11abd5920dae77b0c283b54123;hp=4a936d326f9dbc194dfc8c2fe10c939733fc8fae;hpb=798d3a524ea57aaf40cb53858aaa45ec702f012d;p=elogind.git
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 4a936d326..7b6e673ba 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -297,7 +297,22 @@
Make the container part of the specified
slice, instead of the default
- machine.slice.
+ machine.slice. This is only applies if
+ the machine is run in its own scope unit, i.e. if
+ is not used.
+
+
+
+
+
+
+ Set a unit property on the scope unit to
+ register for the machine. This only applies if the machine is
+ run in its own scope unit, i.e. if
+ is not used. Takes unit property
+ assignments in the same format as systemctl
+ set-property. This is useful to set memory limits
+ and similar for machines.
@@ -455,6 +470,19 @@
above).
+
+
+
+ Specify the process signal to send to the
+ container's PID 1 when nspawn itself receives SIGTERM, in
+ order to trigger an orderly shutdown of the
+ container. Defaults to SIGRTMIN+3 if
+ is used (on systemd-compatible init systems SIGRTMIN+3
+ triggers an orderly shutdown). Takes a signal name like
+ SIGHUP, SIGTERM or
+ similar as argument.
+
+
@@ -598,7 +626,7 @@
Control the architecture ("personality")
reported by
- uname2
+ uname2
in the container. Currently, only x86 and
x86-64 are supported. This is useful when
running a 32-bit container on a 64-bit host. If this setting
@@ -735,7 +763,7 @@
pacman8,
systemd.slice5,
machinectl1,
- btrfs8
+ btrfs8