X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-nspawn.xml;h=f63f72c18d80b70cbf7f6b0caed00344051fea1c;hb=88e995fd720a93460e7c3f38ac24512e6d96b3e8;hp=70ebf94e0ff4ff5fc65c45921a57a9d2d63f579b;hpb=8f7a3c1402a8de36b2c63935358a53510d2fe7c1;p=elogind.git

diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 70ebf94e0..f63f72c18 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 <http://www.gnu.org/licenses/>.
 -->
 
@@ -61,7 +61,7 @@
                 container. In many ways it is similar to
                 <citerefentry><refentrytitle>chroot</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                 but more powerful since it fully virtualizes the file
-                system hierachy, as well as the process tree, the
+                system hierarchy, as well as the process tree, the
                 various IPC subsystems and the host and domain
                 name.</para>
 
@@ -69,11 +69,12 @@
                 to various kernel interfaces in the container to
                 read-only, such as <filename>/sys</filename>,
                 <filename>/proc/sys</filename> or
-                <filename>/selinux</filename>. Network interfaces and
-                the system clock may not be changed from within the
-                container. Device nodes may not be created. The host
-                system cannot be rebooted and kernel modules may not
-                be loaded from within the container.</para>
+                <filename>/sys/fs/selinux</filename>. Network
+                interfaces and the system clock may not be changed
+                from within the container. Device nodes may not be
+                created. The host system cannot be rebooted and kernel
+                modules may not be loaded from within the
+                container.</para>
 
                 <para>Note that even though these security precautions
                 are taken <command>systemd-nspawn</command> is not
@@ -99,14 +100,14 @@
                 <para>Note that <command>systemd-nspawn</command> will
                 mount file systems private to the container to
                 <filename>/dev</filename>,
-                <filename>/dev/.run</filename> and similar. These will
+                <filename>/run</filename> and similar. These will
                 not be visible outside of the container, and their
                 contents will be lost when the container exits.</para>
 
                 <para>Note that running two
                 <command>systemd-nspawn</command> containers from the
                 same directory tree will not make processes in them
-                see each other. The PID namespace seperation of the
+                see each other. The PID namespace separation of the
                 two containers is complete and the containers will
                 share very few runtime objects except for the
                 underlying file system.</para>
@@ -123,6 +124,7 @@
                 <variablelist>
                         <varlistentry>
                                 <term><option>--help</option></term>
+                                <term><option>-h</option></term>
 
                                 <listitem><para>Prints a short help
                                 text and exits.</para></listitem>
@@ -130,7 +132,7 @@
 
                         <varlistentry>
                                 <term><option>--directory=</option></term>
-                                <term><option>--D</option></term>
+                                <term><option>-D</option></term>
 
                                 <listitem><para>Directory to use as
                                 file system root for the namespace
@@ -139,6 +141,39 @@
                                 used.</para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><option>--user=</option></term>
+                                <term><option>-u</option></term>
+
+                                <listitem><para>Run the command
+                                under specified user, create home
+                                directory and cd into it. As rest
+                                of systemd-nspawn, this is not
+                                the security feature and limits
+                                against accidental changes only.
+                                </para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--controllers=</option></term>
+                                <term><option>-C</option></term>
+
+                                <listitem><para>Makes the container appear in
+                                other hierarchies that the name=systemd:/ one.
+                                Takes a comma-separated list of controllers.
+                                </para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--private-network</option></term>
+
+                                <listitem><para>Turn off networking in
+                                the container. This makes all network
+                                interfaces unavailable in the
+                                container, with the exception of the
+                                loopback device.</para></listitem>
+                        </varlistentry>
+
                 </variablelist>
 
         </refsect1>
@@ -160,7 +195,7 @@
                 <title>Example 2</title>
 
                 <programlisting># mock --init
-# systemd-nspawn -D /var/lib/mock/fedora-rawhide-x86_64/root/ /bin/systemd systemd.log_level=debug</programlisting>
+# systemd-nspawn -D /var/lib/mock/fedora-rawhide-x86_64/root/ /sbin/init systemd.log_level=debug</programlisting>
 
                 <para>This installs a minimal Fedora distribution into
                 a subdirectory of <filename>/var/lib/mock/</filename>
@@ -182,7 +217,7 @@
                 <para>
                         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>chroot</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>debootstrap</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+                        <citerefentry><refentrytitle>debootstrap</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>mock</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 </para>
         </refsect1>