X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-nspawn.xml;h=5bf43e8537e843b1fc0a70909e551803a7194b28;hb=ab94af9201496ea3aa59bbf2a01eb750fbd1c08a;hp=dbd2ff5a8add5448ea0a2c0dc1e40473cb593d25;hpb=e0d25329b23a43332ea340f9907721873a316f4e;p=elogind.git
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index dbd2ff5a8..5bf43e853 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -8,16 +8,16 @@
Copyright 2010 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see .
-->
@@ -141,6 +141,16 @@
used.
+
+
+
+
+ Automatically search
+ for an init binary and invoke it
+ instead of a shell or a user supplied
+ program.
+
+
@@ -154,6 +164,27 @@
+
+
+
+ Set the specified uuid
+ for the container. The init system
+ will initialize
+ /etc/machine-id
+ from this if this file is not set yet.
+
+
+
+
+
+
+
+ Makes the container appear in
+ other hierarchies that the name=systemd:/ one.
+ Takes a comma-separated list of controllers.
+
+
+