From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Wed, 15 Jan 2014 17:13:39 +0000 (-0600)
Subject: lxc.conf: note the 'lxc.network.type = none' option
X-Git-Tag: lxc-1.0.0.beta2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04a243f11d5d4891b427107774d30d058bb191e7;p=thirdparty%2Flxc.git

lxc.conf: note the 'lxc.network.type = none' option

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/doc/lxc.conf.sgml.in b/doc/lxc.conf.sgml.in
index 4910cffba..897738fb5 100644
--- a/doc/lxc.conf.sgml.in
+++ b/doc/lxc.conf.sgml.in
@@ -229,6 +229,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 	      virtualization types can be:
 	    </para>
 
+	    <para>
+	      <option>none:</option> will cause the container to share
+	      the host's network namespace.  This means the host
+	      network devices are usable in the container.  It also
+	      means that if both the container and host have upstart as
+	      init, 'halt' in a container (for instance) will shut down the
+	      host.
+	    </para>
+
 	    <para>
 	      <option>empty:</option> will create only the loopback
 	      interface.