On Tue, Jan 13, 2015 at 10:27:08PM +0100, Michael Adam wrote: > Hi, > > This find a patch that (for me) clarifies > the explanation of the veth network type in > the lxc.container.conf manpage. > > Cheers - Michael > > > From a188f5b5c603e62237066eaad17bc35f73a46e32 Mon Sep 17 00:00:00 2001 > From: Michael Adam <ob...@samba.org> > Date: Tue, 13 Jan 2015 22:24:07 +0100 > Subject: [PATCH] doc: clarify the description of the veth network type in the > manpage. > > Signed-off-by: Michael Adam <ob...@samba.org>
Acked-by: Stéphane Graber <stgra...@ubuntu.com> > --- > doc/lxc.container.conf.sgml.in | 26 +++++++++++++------------- > 1 file changed, 13 insertions(+), 13 deletions(-) > > diff --git a/doc/lxc.container.conf.sgml.in b/doc/lxc.container.conf.sgml.in > index 6d4daac..8652373 100644 > --- a/doc/lxc.container.conf.sgml.in > +++ b/doc/lxc.container.conf.sgml.in > @@ -267,20 +267,20 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, > Boston, MA 02110-1301 USA > </para> > > <para> > - <option>veth:</option> a peer network device is created > - with one side assigned to the container and the other > - side is attached to a bridge specified by > - the <option>lxc.network.link</option>. If the bridge is > - not specified, then the veth pair device will be created > - but not attached to any bridge. Otherwise, the bridge > - has to be setup before on the > - system, <command>lxc</command> won't handle any > - configuration outside of the container. By > - default <command>lxc</command> choose a name for the > + <option>veth:</option> a virtual ethernet pair > + device is created with one side assigned to the container > + and the other side attached to a bridge specified by > + the <option>lxc.network.link</option> option. > + If the bridge is not specified, then the veth pair device > + will be created but not attached to any bridge. > + Otherwise, the bridge has to be created on the system > + before starting the container. > + <command>lxc</command> won't handle any > + configuration outside of the container. > + By default, <command>lxc</command> chooses a name for the > network device belonging to the outside of the > - container, this name is handled > - by <command>lxc</command>, but if you wish to handle > - this name yourself, you can tell <command>lxc</command> > + container, but if you wish to handle > + this name yourselves, you can tell <command>lxc</command> > to set a specific name with > the <option>lxc.network.veth.pair</option> option (except for > unprivileged containers where this option is ignored for > security > -- > 2.1.0 > > _______________________________________________ > lxc-devel mailing list > lxc-devel@lists.linuxcontainers.org > http://lists.linuxcontainers.org/listinfo/lxc-devel -- Stéphane Graber Ubuntu developer http://www.ubuntu.com
signature.asc
Description: Digital signature
_______________________________________________ lxc-devel mailing list lxc-devel@lists.linuxcontainers.org http://lists.linuxcontainers.org/listinfo/lxc-devel
