summary refs log tree commit diff
path: root/nixos/doc
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-05-07 17:00:46 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-05-07 17:53:57 +0200
commit6f7aaf10a5beb6cc10ebe75674d9c8664bd187fa (patch)
treec4ced63774765a3b7476d958e1d52c59b7be7cd1 /nixos/doc
parent810680bcae1f8ca23744544e87fbf03b705e9493 (diff)
downloadnixlib-6f7aaf10a5beb6cc10ebe75674d9c8664bd187fa.tar
nixlib-6f7aaf10a5beb6cc10ebe75674d9c8664bd187fa.tar.gz
nixlib-6f7aaf10a5beb6cc10ebe75674d9c8664bd187fa.tar.bz2
nixlib-6f7aaf10a5beb6cc10ebe75674d9c8664bd187fa.tar.lz
nixlib-6f7aaf10a5beb6cc10ebe75674d9c8664bd187fa.tar.xz
nixlib-6f7aaf10a5beb6cc10ebe75674d9c8664bd187fa.tar.zst
nixlib-6f7aaf10a5beb6cc10ebe75674d9c8664bd187fa.zip
Containers: Use systemd-nspawn's --network-veth flag
Note that this causes the name of the host-side interface to change
from c-<name> to ve-<name>.
Diffstat (limited to 'nixos/doc')
-rw-r--r--nixos/doc/manual/containers.xml8
-rw-r--r--nixos/doc/manual/release-notes.xml22
2 files changed, 26 insertions, 4 deletions
diff --git a/nixos/doc/manual/containers.xml b/nixos/doc/manual/containers.xml
index b8f170fc614f..2530d5195212 100644
--- a/nixos/doc/manual/containers.xml
+++ b/nixos/doc/manual/containers.xml
@@ -213,8 +213,8 @@ $ ping -c1 10.233.4.2
 <para>Networking is implemented using a pair of virtual Ethernet
 devices. The network interface in the container is called
 <literal>eth0</literal>, while the matching interface in the host is
-called <literal>c-<replaceable>container-name</replaceable></literal>
-(e.g., <literal>c-foo</literal>).  The container has its own network
+called <literal>ve-<replaceable>container-name</replaceable></literal>
+(e.g., <literal>ve-foo</literal>).  The container has its own network
 namespace and the <literal>CAP_NET_ADMIN</literal> capability, so it
 can perform arbitrary network configuration such as setting up
 firewall rules, without affecting or having access to the host’s
@@ -228,11 +228,11 @@ on the host:
 
 <programlisting>
 networking.nat.enable = true;
-networking.nat.internalInterfaces = ["c-+"];
+networking.nat.internalInterfaces = ["ve-+"];
 networking.nat.externalInterface = "eth0";
 </programlisting>
 where <literal>eth0</literal> should be replaced with the desired
-external interface. Note that <literal>c-+</literal> is a wildcard
+external interface. Note that <literal>ve-+</literal> is a wildcard
 that matches all container interfaces.</para>
 
 </section>
diff --git a/nixos/doc/manual/release-notes.xml b/nixos/doc/manual/release-notes.xml
index 836cb5c19f4c..52e88bb4c861 100644
--- a/nixos/doc/manual/release-notes.xml
+++ b/nixos/doc/manual/release-notes.xml
@@ -6,6 +6,28 @@
 
 <!--==================================================================-->
 
+<section xml:id="sec-release-14.10">
+
+<title>Release 14.10 (“Caterpillar”, 2014/10/??)</title>
+
+<para>When upgrading from a previous release, please be aware of the
+following incompatible changes:
+
+<itemizedlist>
+
+  <listitem><para>The host side of a container virtual Ethernet pair
+  is now called <literal>ve-<replaceable>container-name</replaceable></literal>
+  rather than <literal>c-<replaceable>container-name</replaceable></literal>.</para></listitem>
+
+</itemizedlist>
+
+</para>
+
+</section>
+
+
+<!--==================================================================-->
+
 <section xml:id="sec-release-14.04">
 
 <title>Release 14.04 (“Baboon”, 2014/04/30)</title>