Merge lp:~ubuntu-branches/ubuntu/precise/lxc/precise-201203141828 into lp:ubuntu/precise/lxc

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/precise/lxc reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/lxc/precise-201203141828. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

77. By Serge Hallyn on 2012-03-14

[Serge Hallyn]
* 0057-update-manpages: update manual pages to reflect some new options.
[Gary Poster]
* lxc-start-ephemeral: fix broken use of '-- command' (LP: #954632)

=== added directory '.pc/0057-update-manpages'
=== renamed directory '.pc/0057-update-manpages' => '.pc/0057-update-manpages.moved'
=== added file '.pc/0057-update-manpages/.timestamp'
=== added directory '.pc/0057-update-manpages/doc'
=== added file '.pc/0057-update-manpages/doc/lxc-create.sgml.in'
--- .pc/0057-update-manpages/doc/lxc-create.sgml.in	1970-01-01 00:00:00 +0000
+++ .pc/0057-update-manpages/doc/lxc-create.sgml.in	2012-03-14 18:33:20 +0000
@@ -0,0 +1,166 @@
+<!-- 
+
+lxc: linux Container library
+
+(C) Copyright IBM Corp. 2007, 2008
+
+Authors:
+Daniel Lezcano <dlezcano at fr.ibm.com>
+
+This library is free software; you can redistribute it and/or
+modify it 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.
+
+This library 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
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+-->
+
+<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+
+<!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
+<!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
+]>
+
+<refentry>
+
+  <docinfo><date>@LXC_GENERATE_DATE@</date></docinfo>
+
+  <refmeta>
+    <refentrytitle>lxc-create</refentrytitle>
+    <manvolnum>1</manvolnum>
+  </refmeta>
+
+  <refnamediv>
+    <refname>lxc-create</refname>
+
+    <refpurpose>
+      creates a container
+    </refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>lxc-create <replaceable>-n name</replaceable>
+       <optional>-f config_file</optional>
+       <optional>-t template</optional></command>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>
+      <command>lxc-create</command> creates a system object where is
+      stored the configuration informations and where can be stored
+      user information. The identifier <replaceable>name</replaceable>
+      is used to specify the container to be used with the different
+      lxc commands.
+    </para>
+    <para>
+      The object is a directory created in <filename>@LXCPATH@</filename>
+      and identified by its name.
+    </para>
+
+    <para>
+      The object is the definition of the different resources an
+      application can use or can see. The more the configuration file
+      contains informations, the more the container is isolated and
+      the more the application is jailed.
+    </para>
+
+    <para>
+      If the configuration file <replaceable>config_file</replaceable>
+      is not specified, the container will be created with the default
+      isolation: processes, sysv ipc and mount points.
+    </para>
+  </refsect1>
+
+  <refsect1>
+    <title>Options</title>
+    <variablelist>
+
+      <varlistentry>
+	<term>
+	  <option>-f <replaceable>config_file</replaceable></option>
+	</term>
+	<listitem>
+	  <para>
+	    Specify the configuration file to configure the virtualization
+	    and isolation functionalities for the container.
+	  </para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>
+	  <option>-t <replaceable>template</replaceable></option>
+	</term>
+	<listitem>
+	  <para>
+	    'template' is the short name of an existing 'lxc-template'
+	    script that is called by lxc-create,
+	    eg. busybox, debian, fedora, ubuntu or sshd.
+	    Refer to the examples in <filename>@LXCTEMPLATEDIR@</filename>
+	    for details of the expected script structure.
+	  </para>
+	</listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </refsect1>
+
+  <refsect1>
+    <title>Diagnostic</title>
+
+    <variablelist>
+
+      <varlistentry>
+        <term>The container already exists</term>
+        <listitem>
+          <para>
+	    As the message mention it, you try to create a container
+	    but there is a container with the same name. You can use
+	    the <command>lxc-ls -l</command> command to list the
+	    available containers on the system.
+          </para>
+        </listitem>
+      </varlistentry>    
+
+    </variablelist>
+
+  </refsect1>
+
+  &seealso;
+
+  <refsect1>
+    <title>Author</title>
+    <para>Daniel Lezcano <email>[e-mail]</email></para>
+  </refsect1>
+
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->

=== added file '.pc/0057-update-manpages/doc/lxc-destroy.sgml.in'
--- .pc/0057-update-manpages/doc/lxc-destroy.sgml.in	1970-01-01 00:00:00 +0000
+++ .pc/0057-update-manpages/doc/lxc-destroy.sgml.in	2012-03-14 18:33:20 +0000
@@ -0,0 +1,111 @@
+<!-- 
+
+lxc: linux Container library
+
+(C) Copyright IBM Corp. 2007, 2008
+
+Authors:
+Daniel Lezcano <dlezcano at fr.ibm.com>
+
+This library is free software; you can redistribute it and/or
+modify it 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.
+
+This library 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
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+-->
+
+<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+
+<!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
+<!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
+]>
+
+<refentry>
+
+  <docinfo><date>@LXC_GENERATE_DATE@</date></docinfo>
+
+  <refmeta>
+    <refentrytitle>lxc-destroy</refentrytitle>
+    <manvolnum>1</manvolnum>
+  </refmeta>
+
+  <refnamediv>
+    <refname>lxc-destroy</refname>
+
+    <refpurpose>
+      destroy a container.
+    </refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>lxc-destroy <replaceable>-n
+      name</replaceable></command>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>
+      <command>lxc-destroy</command> destroys the system object
+      previously created by the <command>lxc-create</command> command.
+    </para>
+
+  </refsect1>
+
+  <refsect1>
+    <title>Diagnostic</title>
+
+    <variablelist>
+
+      <varlistentry>
+        <term>The container was not found</term>
+        <listitem>
+          <para>
+	    The specified container for destruction was not found. It
+	    is probable it does not exists and was already
+	    destroyed.You can use the <command>lxc-ls -l</command>
+	    command to list the available containers on the system.
+          </para>
+        </listitem>
+      </varlistentry>    
+
+    </variablelist>
+
+  </refsect1>
+
+  &seealso;
+
+  <refsect1>
+    <title>Author</title>
+    <para>Daniel Lezcano <email>[e-mail]</email></para>
+  </refsect1>
+
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->

=== added file '.pc/0057-update-manpages/doc/lxc-start.sgml.in'
--- .pc/0057-update-manpages/doc/lxc-start.sgml.in	1970-01-01 00:00:00 +0000
+++ .pc/0057-update-manpages/doc/lxc-start.sgml.in	2012-03-14 18:33:20 +0000
@@ -0,0 +1,200 @@
+<!-- 
+
+lxc: linux Container library
+
+(C) Copyright IBM Corp. 2007, 2008
+
+Authors:
+Daniel Lezcano <dlezcano at fr.ibm.com>
+
+This library is free software; you can redistribute it and/or
+modify it 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.
+
+This library 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
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+-->
+
+<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+
+<!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
+<!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
+]>
+
+<refentry>
+
+  <docinfo><date>@LXC_GENERATE_DATE@</date></docinfo>
+
+  <refmeta>
+    <refentrytitle>lxc-start</refentrytitle>
+    <manvolnum>1</manvolnum>
+  </refmeta>
+
+  <refnamediv>
+    <refname>lxc-start</refname>
+
+    <refpurpose>
+      run an application inside a container.
+    </refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <cmdsynopsis><command>lxc-start <replaceable>-n
+    name</replaceable> <optional>-f
+    config_file</optional> <optional>-c
+    console_file</optional> <optional>-d</optional> <optional>-s
+    KEY=VAL</optional>
+    <optional>command</optional></command></cmdsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>
+      <command>lxc-start</command> runs the specified
+      <replaceable>command</replaceable> inside the container
+      specified by <replaceable>name</replaceable>.
+    </para>
+    <para>
+      It will setup the container
+      according to the configuration previously defined with the
+      lxc-create command or with the configuration file parameter.
+      If no configuration is
+      defined, the default isolation is used.
+    </para>
+    <para>
+      The orphan process group
+      and daemon are not supported by this command, use
+      the <command>lxc-execute</command> command instead.
+    </para>
+    <para>
+      If no command is specified, <command>lxc-start</command> will
+      use the default
+      <command>"/sbin/init"</command> command to run a system
+      container.
+    </para>
+
+  </refsect1>
+
+  <refsect1>
+
+    <title>Options</title>
+
+    <variablelist>
+
+      <varlistentry>
+	<term>
+	  <option>-d, --daemon</option>
+	</term>
+	<listitem>
+	  <para>
+	    Run the container as a daemon. As the container has no
+	    more tty, if an error occurs nothing will be displayed,
+	    the log file can be used to check the error.
+	  </para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>
+	  <option>-f, --rcfile <replaceable>config_file</replaceable></option>
+	</term>
+	<listitem>
+	  <para>
+	    Specify the configuration file to configure the virtualization
+	    and isolation functionalities for the container.
+	  </para>
+	  <para>
+	   This configuration file if present will be used even if there is
+	   already a configuration file present in the previously created
+	   container (via lxc-create).
+	  </para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>
+	  <option>-c,
+	  --console <replaceable>console_file</replaceable></option>
+	</term>
+	<listitem>
+	  <para>
+	    Specify a file to output the container console. If the
+	    option is not specified the output will go the terminal
+	    except if the <option>-d</option> is specified.
+	  </para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>
+	  <option>-s, --define <replaceable>KEY=VAL</replaceable></option>
+	</term>
+	<listitem>
+	  <para>
+	    Assign value <replaceable>VAL</replaceable> to configuration
+	    variable <replaceable>KEY</replaceable>. This overrides any
+	    assignment done in <replaceable>config_file</replaceable>.
+	  </para>
+	</listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </refsect1>
+
+  &commonoptions;
+
+  <refsect1>
+    <title>Diagnostic</title>
+
+    <variablelist>
+
+      <varlistentry>
+        <term>The container is busy</term>
+        <listitem>
+          <para>
+	    The specified container is already running an
+	    application. You should stop it before reuse this
+	    container or create a new one.
+          </para>
+        </listitem>
+      </varlistentry>    
+
+    </variablelist>
+
+  </refsect1>
+
+  &seealso;
+
+  <refsect1>
+    <title>Author</title>
+    <para>Daniel Lezcano <email>[e-mail]</email></para>
+  </refsect1>
+
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->

=== added file '.pc/0057-update-manpages/doc/lxc.conf.sgml.in'
--- .pc/0057-update-manpages/doc/lxc.conf.sgml.in	1970-01-01 00:00:00 +0000
+++ .pc/0057-update-manpages/doc/lxc.conf.sgml.in	2012-03-14 18:33:20 +0000
@@ -0,0 +1,700 @@
+<!-- 
+
+lxc: linux Container library
+
+(C) Copyright IBM Corp. 2007, 2008
+
+Authors:
+Daniel Lezcano <dlezcano at fr.ibm.com>
+
+This library is free software; you can redistribute it and/or
+modify it 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.
+
+This library 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
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+-->
+
+<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+
+<!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
+]>
+
+<refentry>
+
+  <docinfo><date>@LXC_GENERATE_DATE@</date></docinfo>
+
+  <refmeta>
+    <refentrytitle>lxc.conf</refentrytitle>
+    <manvolnum>5</manvolnum>
+  </refmeta>
+
+  <refnamediv>
+    <refname>lxc.conf</refname>
+
+    <refpurpose>
+      linux container configuration file
+    </refpurpose>
+  </refnamediv>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para>
+      The linux containers (<command>lxc</command>) are always created
+      before being used. This creation defines a set of system
+      resources to be virtualized / isolated when a process is using
+      the container. By default, the pids, sysv ipc and mount points
+      are virtualized and isolated. The other system resources are
+      shared across containers, until they are explicitly defined in
+      the configuration file. For example, if there is no network
+      configuration, the network will be shared between the creator of
+      the container and the container itself, but if the network is
+      specified, a new network stack is created for the container and
+      the container can no longer use the network of its ancestor.
+    </para>
+
+    <para>
+      The configuration file defines the different system resources to
+      be assigned for the container. At present, the utsname, the
+      network, the mount points, the root file system and the control
+      groups are supported.
+    </para>
+
+    <para>
+      Each option in the configuration file has the form <command>key
+      = value</command> fitting in one line. The '#' character means
+      the line is a comment.
+    </para>
+
+    <refsect2>
+      <title>Architecture</title>
+      <para>
+	Allows to set the architecture for the container. For example,
+	set a 32bits architecture for a container running 32bits
+	binaries on a 64bits host. That fix the container scripts
+	which rely on the architecture to do some work like
+	downloading the packages.
+      </para>
+
+      <variablelist>
+	<varlistentry>
+	  <term>
+	    <option>lxc.arch</option>
+	  </term>
+	  <listitem>
+	    <para>
+	      Specify the architecture for the container.
+	    </para>
+	    <para>
+	      Valid options are
+	      <option>x86</option>,
+	      <option>i686</option>,
+	      <option>x86_64</option>,
+	      <option>amd64</option>
+	    </para>
+	  </listitem>
+	</varlistentry>
+      </variablelist>
+
+    </refsect2>
+
+    <refsect2>
+      <title>Hostname</title>
+      <para>
+	The utsname section defines the hostname to be set for the
+	container. That means the container can set its own hostname
+	without changing the one from the system. That makes the
+	hostname private for the container.
+      </para>
+      <variablelist>
+	<varlistentry>
+	  <term>
+	    <option>lxc.utsname</option>
+	  </term>
+	  <listitem>
+	    <para>
+	      specify the hostname for the container
+	    </para>
+	  </listitem>
+	</varlistentry>
+      </variablelist>
+    </refsect2>
+
+    <refsect2>
+      <title>Network</title>
+      <para>
+	The network section defines how the network is virtualized in
+	the container. The network virtualization acts at layer
+	two. In order to use the network virtualization, parameters
+	must be specified to define the network interfaces of the
+	container. Several virtual interfaces can be assigned and used
+	in a container even if the system has only one physical
+	network interface.
+      </para>
+      <variablelist>
+	<varlistentry>
+	  <term>
+	    <option>lxc.network.type</option>
+	  </term>
+	  <listitem>
+	    <para>
+	      specify what kind of network virtualization to be used
+	      for the container. Each time
+	      a <option>lxc.network.type</option> field is found a new
+	      round of network configuration begins. In this way,
+	      several network virtualization types can be specified
+	      for the same container, as well as assigning several
+	      network interfaces for one container. The different
+	      virtualization types can be:
+	    </para>
+
+	    <para>
+	      <option>empty:</option> will create only the loopback
+	      interface.
+	    </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
+	      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>
+	      to set a specific name with
+	      the <option>lxc.network.veth.pair</option> option.
+	    </para>
+
+	    <para>
+	      <option>vlan:</option> a vlan interface is linked with
+	      the interface specified by
+	      the <option>lxc.network.link</option> and assigned to
+	      the container. The vlan identifier is specified with the
+	      option <option>lxc.network.vlan.id</option>.
+	    </para>
+
+	    <para>
+	      <option>macvlan:</option> a macvlan interface is linked
+	      with the interface specified by
+	      the <option>lxc.network.link</option> and assigned to
+	      the container.
+	      <option>lxc.network.macvlan.mode</option> specifies the
+	      mode the macvlan will use to communicate between
+	      different macvlan on the same upper device. The accepted
+	      modes are <option>private</option>, the device never
+	      communicates with any other device on the same upper_dev (default),
+	      <option>vepa</option>, the new Virtual Ethernet Port
+	      Aggregator (VEPA) mode, it assumes that the adjacent
+	      bridge returns all frames where both source and
+	      destination are local to the macvlan port, i.e. the
+	      bridge is set up as a reflective relay.  Broadcast
+	      frames coming in from the upper_dev get flooded to all
+	      macvlan interfaces in VEPA mode, local frames are not
+	      delivered locallay, or <option>bridge</option>, it
+	      provides the behavior of a simple bridge between
+	      different macvlan interfaces on the same port. Frames
+	      from one interface to another one get delivered directly
+	      and are not sent out externally. Broadcast frames get
+	      flooded to all other bridge ports and to the external
+	      interface, but when they come back from a reflective
+	      relay, we don't deliver them again.  Since we know all
+	      the MAC addresses, the macvlan bridge mode does not
+	      require learning or STP like the bridge module does.
+	    </para>
+
+	    <para>
+	      <option>phys:</option> an already existing interface
+	      specified by the <option>lxc.network.link</option> is
+	      assigned to the container.
+	    </para>
+	  </listitem>
+	  </varlistentry>
+
+	<varlistentry>
+	  <term>
+	    <option>lxc.network.flags</option>
+	  </term>
+	  <listitem>
+	    <para>
+	      specify an action to do for the
+	      network.
+	    </para>
+	    
+	    <para><option>up:</option> activates the interface.
+	    </para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
+	  <term>
+	    <option>lxc.network.link</option>
+	  </term>
+	  <listitem>
+	    <para>
+	      specify the interface to be used for real network
+	      traffic.
+	    </para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
+	  <term>
+	    <option>lxc.network.name</option>
+	  </term>
+	  <listitem>
+	    <para>
+	      the interface name is dynamically allocated, but if
+	      another name is needed because the configuration files
+	      being used by the container use a generic name,
+	      eg. eth0, this option will rename the interface in the
+	      container.
+	    </para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
+	  <term>
+	    <option>lxc.network.hwaddr</option>
+	  </term>
+	  <listitem>
+	    <para>
+	      the interface mac address is dynamically allocated by
+	      default to the virtual interface, but in some cases,
+	      this is needed to resolve a mac address conflict or to
+	      always have the same link-local ipv6 address
+	    </para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
+	  <term>
+	    <option>lxc.network.ipv4</option>
+	  </term>
+	  <listitem>
+	    <para>
+	      specify the ipv4 address to assign to the virtualized
+	      interface. Several lines specify several ipv4 addresses.
+	      The address is in format x.y.z.t/m,
+	      eg. 192.168.1.123/24. The broadcast address should be
+	      specified on the same line, right after the ipv4
+	      address.
+	    </para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
+	  <term>
+	    <option>lxc.network.ipv6</option>
+	  </term>
+	  <listitem>
+	    <para>
+	      specify the ipv6 address to assign to the virtualized
+	      interface. Several lines specify several ipv6 addresses.
+	      The address is in format x::y/m,
+	      eg. 2003:db8:1:0:214:1234:fe0b:3596/64
+	    </para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
+	  <term>
+	    <option>lxc.network.script.up</option>
+	  </term>
+	  <listitem>
+	    <para>
+	      add a configuration option to specify a script to be
+	      executed after creating and configuring the network used
+	      from the host side. The following arguments are passed
+	      to the script: container name and config section name
+	      (net) Additional arguments depend on the config section
+	      employing a script hook; the following are used by the
+	      network system: execution context (up), network type
+	      (empty/veth/macvlan/phys), Depending on the network
+	      type, other arguments may be passed:
+	      veth/macvlan/phys. And finally (host-sided) device name.
+	    </para>
+	  </listitem>
+	</varlistentry>
+      </variablelist>
+    </refsect2>
+
+    <refsect2>
+      <title>New pseudo tty instance (devpts)</title>
+      <para>
+	For stricter isolation the container can have its own private
+	instance of the pseudo tty.
+      </para>
+      <variablelist>
+	<varlistentry>
+	  <term>
+	    <option>lxc.pts</option>
+	  </term>
+	  <listitem>
+	    <para>
+	      If set, the container will have a new pseudo tty
+	      instance, making this private to it. The value specifies
+              the maximum number of pseudo ttys allowed for a pts
+              instance (this limitation is not implemented yet).
+	    </para>
+	  </listitem>
+	</varlistentry>
+      </variablelist>
+    </refsect2>
+
+    <refsect2>
+      <title>Container system console</title>
+      <para>
+	If the container is configured with a root filesystem and the
+	inittab file is setup to use the console, you may want to specify
+	where goes the output of this console.
+      </para>
+      <variablelist>
+	<varlistentry>
+	  <term>
+	    <option>lxc.console</option>
+	  </term>
+	  <listitem>
+	    <para>
+	      Specify a path to a file where the console output will
+	      be written. The keyword 'none' will simply disable the
+	      console. This is dangerous once if have a rootfs with a
+	      console device file where the application can write, the
+	      messages will fall in the host.
+	    </para>
+	  </listitem>
+	</varlistentry>
+      </variablelist>
+    </refsect2>
+
+    <refsect2>
+      <title>Console through the ttys</title>
+      <para>
+	If the container is configured with a root filesystem and the
+	inittab file is setup to launch a getty on the ttys. This
+	option will specify the number of ttys to be available for the
+	container. The number of getty in the inittab file of the
+	container should not be greater than the number of ttys
+	specified in this configuration file, otherwise the excess
+	getty sessions will die and respawn indefinitly giving
+	annoying messages on the console.
+      </para>
+      <variablelist>
+	<varlistentry>
+	  <term>
+	    <option>lxc.tty</option>
+	  </term>
+	  <listitem>
+	    <para>
+	      Specify the number of tty to make available to the
+	      container.
+	    </para>
+	  </listitem>
+	</varlistentry>
+      </variablelist>
+    </refsect2>
+
+    <refsect2>
+      <title>Mount points</title>
+      <para>
+	The mount points section specifies the different places to be
+	mounted. These mount points will be private to the container
+	and won't be visible by the processes running outside of the
+	container. This is useful to mount /etc, /var or /home for
+	examples.
+      </para>
+      <variablelist>
+	<varlistentry>
+	  <term>
+	    <option>lxc.mount</option>
+	  </term>
+	  <listitem>
+	    <para>
+	      specify a file location in
+	      the <filename>fstab</filename> format, containing the
+	      mount informations. If the rootfs is an image file or a
+	      device block and the fstab is used to mount a point
+	      somewhere in this rootfs, the path of the rootfs mount
+	      point should be prefixed with the
+	      <filename>@LXCROOTFSMOUNT@</filename> default path or
+	      the value of <option>lxc.rootfs.mount</option> if
+	      specified.
+	    </para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
+	  <term>
+	    <option>lxc.mount.entry</option>
+	  </term>
+	  <listitem>
+	    <para>
+	      specify a mount point corresponding to a line in the
+	      fstab format.
+	    </para>
+	  </listitem>
+	</varlistentry>
+
+      </variablelist>
+    </refsect2>
+
+    <refsect2>
+      <title>Root file system</title>
+      <para>
+	The root file system of the container can be different than that
+	of the host system.
+      </para>
+      <variablelist>
+	<varlistentry>
+	  <term>
+	    <option>lxc.rootfs</option>
+	  </term>
+	  <listitem>
+	    <para>
+	      specify the root file system for the container. It can
+	      be an image file, a directory or a block device. If not
+	      specified, the container shares its root file system
+	      with the host.
+	    </para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
+	  <term>
+	    <option>lxc.rootfs.mount</option>
+	  </term>
+	  <listitem>
+	    <para>
+	      where to recursively bind <option>lxc.rootfs</option>
+	      before pivoting.  This is to ensure success of the
+	      <citerefentry>
+		<refentrytitle><command>pivot_root</command></refentrytitle>
+		<manvolnum>8</manvolnum>
+	      </citerefentry>
+	      syscall.  Any directory suffices, the default should
+	      generally work.
+	    </para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
+	  <term>
+	    <option>lxc.pivotdir</option>
+	  </term>
+	  <listitem>
+	    <para>
+	      where to pivot the original root file system under
+	      <option>lxc.rootfs</option>, specified relatively to
+	      that.  The default is <filename>mnt</filename>.
+	      It is created if necessary, and also removed after
+	      unmounting everything from it during container setup.
+	    </para>
+	  </listitem>
+	</varlistentry>
+      </variablelist>
+    </refsect2>
+
+    <refsect2>
+      <title>Control group</title>
+      <para>
+	The control group section contains the configuration for the
+	different subsystem. <command>lxc</command> does not check the
+	correctness of the subsystem name. This has the disadvantage
+	of not detecting configuration errors until the container is
+	started, but has the advantage of permitting any future
+	subsystem.
+      </para>
+      <variablelist>
+	<varlistentry>
+	  <term>
+	    <option>lxc.cgroup.[subsystem name]</option>
+	  </term>
+	  <listitem>
+	    <para>
+	      specify the control group value to be set.  The
+	      subsystem name is the literal name of the control group
+	      subsystem.  The permitted names and the syntax of their
+	      values is not dictated by LXC, instead it depends on the
+	      features of the Linux kernel running at the time the
+	      container is started,
+	      eg. <option>lxc.cgroup.cpuset.cpus</option>
+	    </para>
+	  </listitem>
+	</varlistentry>
+      </variablelist>
+    </refsect2>
+
+    <refsect2>
+      <title>Capabilities</title>
+      <para>
+	The capabilities can be dropped in the container if this one
+	is run as root.
+      </para>
+      <variablelist>
+	<varlistentry>
+	  <term>
+	    <option>lxc.cap.drop</option>
+	  </term>
+	  <listitem>
+	    <para>
+	      Specify the capability to be dropped in the container. A
+	      single line defining several capabilities with a space
+	      separation is allowed. The format is the lower case of
+	      the capability definition without the "CAP_" prefix,
+	      eg. CAP_SYS_MODULE should be specified as
+	      sys_module. See
+	      <citerefentry>
+		<refentrytitle><command>capabilities</command></refentrytitle>
+		<manvolnum>7</manvolnum>
+	      </citerefentry>,
+	    </para>
+	  </listitem>
+	</varlistentry>
+      </variablelist>
+    </refsect2>
+
+  </refsect1>
+
+  <refsect1>
+    <title>Examples</title>
+      <para>
+	In addition to the few examples given below, you will find
+	some other examples of configuration file in @DOCDIR@/examples
+      </para>
+    <refsect2>
+      <title>Network</title>
+      <para>This configuration sets up a container to use a veth pair
+	device with one side plugged to a bridge br0 (which has been
+	configured before on the system by the administrator). The
+	virtual network device visible in the container is renamed to
+	eth0.</para>
+      <programlisting>
+	lxc.utsname = myhostname
+	lxc.network.type = veth
+	lxc.network.flags = up
+	lxc.network.link = br0
+	lxc.network.name = eth0
+	lxc.network.hwaddr = 4a:49:43:49:79:bf
+	lxc.network.ipv4 = 10.2.3.5/24 10.2.3.255
+	lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3597
+      </programlisting>
+    </refsect2>
+
+    <refsect2>
+      <title>Control group</title>
+      <para>This configuration will setup several control groups for
+      the application, cpuset.cpus restricts usage of the defined cpu,
+      cpus.share prioritize the control group, devices.allow makes
+      usable the specified devices.</para>
+      <programlisting>
+	lxc.cgroup.cpuset.cpus = 0,1
+	lxc.cgroup.cpu.shares = 1234
+	lxc.cgroup.devices.deny = a
+	lxc.cgroup.devices.allow = c 1:3 rw
+	lxc.cgroup.devices.allow = b 8:0 rw
+      </programlisting>
+    </refsect2>
+
+    <refsect2>
+      <title>Complex configuration</title>
+      <para>This example show a complex configuration making a complex
+      network stack, using the control groups, setting a new hostname,
+      mounting some locations and a changing root file system.</para>
+      <programlisting>
+	lxc.utsname = complex
+	lxc.network.type = veth
+	lxc.network.flags = up
+	lxc.network.link = br0
+	lxc.network.hwaddr = 4a:49:43:49:79:bf
+	lxc.network.ipv4 = 10.2.3.5/24 10.2.3.255
+	lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3597
+	lxc.network.ipv6 = 2003:db8:1:0:214:5432:feab:3588
+	lxc.network.type = macvlan
+	lxc.network.flags = up
+	lxc.network.link = eth0
+	lxc.network.hwaddr = 4a:49:43:49:79:bd
+	lxc.network.ipv4 = 10.2.3.4/24
+	lxc.network.ipv4 = 192.168.10.125/24
+	lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596
+	lxc.network.type = phys
+	lxc.network.flags = up
+	lxc.network.link = dummy0
+	lxc.network.hwaddr = 4a:49:43:49:79:ff
+	lxc.network.ipv4 = 10.2.3.6/24
+	lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3297
+	lxc.cgroup.cpuset.cpus = 0,1
+	lxc.cgroup.cpu.shares = 1234
+	lxc.cgroup.devices.deny = a
+	lxc.cgroup.devices.allow = c 1:3 rw
+	lxc.cgroup.devices.allow = b 8:0 rw
+	lxc.mount = /etc/fstab.complex
+	lxc.mount.entry = /lib /root/myrootfs/lib none ro,bind 0 0
+	lxc.rootfs = /mnt/rootfs.complex
+	lxc.cap.drop = sys_module mknod setuid net_raw
+	lxc.cap.drop = mac_override
+      </programlisting>
+    </refsect2>
+
+  </refsect1>
+
+  <refsect1>
+    <title>See Also</title>
+    <simpara>    
+      <citerefentry>
+	<refentrytitle><command>chroot</command></refentrytitle>
+	<manvolnum>1</manvolnum>
+      </citerefentry>,
+
+      <citerefentry>
+	<refentrytitle><command>pivot_root</command></refentrytitle>
+	<manvolnum>8</manvolnum>
+      </citerefentry>,
+
+      <citerefentry>
+	<refentrytitle><filename>fstab</filename></refentrytitle>
+	<manvolnum>5</manvolnum>
+      </citerefentry>
+
+    </simpara>
+  </refsect1>
+  
+  &seealso;
+
+  <refsect1>
+    <title>Author</title>
+    <para>Daniel Lezcano <email>[e-mail]</email></para>
+  </refsect1>
+  
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->

=== added file 'debian/patches/0057-update-manpages'
--- debian/patches/0057-update-manpages	1970-01-01 00:00:00 +0000
+++ debian/patches/0057-update-manpages	2012-03-14 18:33:20 +0000
@@ -0,0 +1,194 @@
+From c774908818f8ab22175edf9015c3396a222c3fa8 Mon Sep 17 00:00:00 2001
+From: Ubuntu <[e-mail]>
+Date: Wed, 14 Mar 2012 02:30:41 +0000
+Subject: [PATCH] Update manpages to reflect some updated options.
+
+Signed-off-by: Serge Hallyn <[e-mail]>
+---
+ doc/lxc-create.sgml.in  |   45 ++++++++++++++++++++++++++++++++++++++++++++-
+ doc/lxc-destroy.sgml.in |   25 ++++++++++++++++++++++++-
+ doc/lxc-start.sgml.in   |   17 ++++++++++++++++-
+ doc/lxc.conf.sgml.in    |   29 +++++++++++++++++++++++++++++
+ 4 files changed, 113 insertions(+), 3 deletions(-)
+
+Index: lxc/doc/lxc-create.sgml.in
+===================================================================
+--- lxc.orig/doc/lxc-create.sgml.in	2012-03-14 10:32:06.659876000 -0500
++++ lxc/doc/lxc-create.sgml.in	2012-03-14 10:46:38.562522470 -0500
+@@ -50,7 +50,10 @@
+     <cmdsynopsis>
+       <command>lxc-create <replaceable>-n name</replaceable>
+        <optional>-f config_file</optional>
+-       <optional>-t template</optional></command>
++       <optional>-t template</optional>
++       <optional>-B backingstore</optional>
++       <optional>-- template-options</optional>
++       </command>
+     </cmdsynopsis>
+   </refsynopsisdiv>
+ 
+@@ -114,6 +117,46 @@
+ 	</listitem>
+       </varlistentry>
+ 
++      <varlistentry>
++	<term>
++	  <option>-B <replaceable>backingstore</replaceable></option>
++	</term>
++	<listitem>
++	  <para>
++	    'backingstore' is one of 'none', 'lvm', or 'btrfs'.  The
++	    default is 'none', meaning that the container root filesystem
++	    will be a directory under <filename>@LXCPATH@/container/rootfs</filename>.
++	    The option 'btrfs' need not be specified as it will be used
++	    automatically if the <filename>@LXCPATH@</filename> filesystem is found to
++	    be btrfs.  If backingstore is 'lvm', then an lvm block device will be
++	    used and the following further options are available:
++	    <replaceable>--lvname lvname1</replaceable> will create an LV
++	    named <filename>lvname1</filename> rather than the default, which
++	    is the container name.  <replaceable>--vgname vgname1</replaceable>
++	    will create the LV in volume group <filename>vgname1</filename>
++	    rather than the default, <filename>lxc</filename>.
++	    <replaceable>--fstype FSTYPE</replaceable> will create an FSTYPE
++	    filesystem on the LV, rather than the default, which is ext4.
++	    <replaceable>--fssize SIZE</replaceable> will create a LV (and
++	    filesystem) of size SIZE rather than the default, which is 1G.
++	  </para>
++	</listitem>
++
++      <varlistentry>
++	<term>
++	  <option>-- <replaceable>template-options</replaceable></option>
++	</term>
++	<listitem>
++	  <para>
++	    This will pass <replaceable>template-options</replaceable> to the
++	    template as arguments.  To see the list of options supported by
++	    the template, you can run
++	    <command>lxc-create -t TEMPLATE -h</command>.
++	  </para>
++	</listitem>
++      </varlistentry>
++      </varlistentry>
++
+     </variablelist>
+ 
+   </refsect1>
+Index: lxc/doc/lxc-destroy.sgml.in
+===================================================================
+--- lxc.orig/doc/lxc-destroy.sgml.in	2012-03-14 10:32:06.659876000 -0500
++++ lxc/doc/lxc-destroy.sgml.in	2012-03-14 10:46:38.562522470 -0500
+@@ -49,7 +49,9 @@
+   <refsynopsisdiv>
+     <cmdsynopsis>
+       <command>lxc-destroy <replaceable>-n
+-      name</replaceable></command>
++      name</replaceable>
++      <optional>-f</optional>
++      </command>
+     </cmdsynopsis>
+   </refsynopsisdiv>
+ 
+@@ -63,6 +65,27 @@
+ 
+   </refsect1>
+ 
++  <refsect1>
++
++    <title>Options</title>
++
++    <variablelist>
++      <varlistentry>
++	<term>
++	  <option>-f</option>
++	</term>
++	<listitem>
++	  <para>
++	    If a container is running, stop it first.  If this option is
++	    not specified and the container is running, then
++	    <command>lxc-destroy</command> will be aborted.
++	  </para>
++	</listitem>
++      </varlistentry>
++    </variablelist>
++
++  </refsect1>
++
+   <refsect1>
+     <title>Diagnostic</title>
+ 
+Index: lxc/doc/lxc-start.sgml.in
+===================================================================
+--- lxc.orig/doc/lxc-start.sgml.in	2012-03-14 10:32:06.659876000 -0500
++++ lxc/doc/lxc-start.sgml.in	2012-03-14 10:46:38.562522470 -0500
+@@ -51,7 +51,7 @@
+     name</replaceable> <optional>-f
+     config_file</optional> <optional>-c
+     console_file</optional> <optional>-d</optional> <optional>-s
+-    KEY=VAL</optional>
++    KEY=VAL</optional> <optional>-C</optional>
+     <optional>command</optional></command></cmdsynopsis>
+   </refsynopsisdiv>
+ 
+@@ -146,6 +146,21 @@
+ 	  </para>
+ 	</listitem>
+       </varlistentry>
++
++      <varlistentry>
++	<term>
++	  <option>-C,
++	  --close-all-fds</option>
++	</term>
++	<listitem>
++	  <para>
++	  If any file descriptors are inherited, close them.  If this option
++	  is not specified, then <command>lxc-start</command> will exit with
++	  failure instead. Note: <replaceable>--daemon</replaceable> implies
++	  <replaceable>--close-all-fds</replaceable>.
++	  </para>
++	</listitem>
++      </varlistentry>
+ 
+     </variablelist>
+ 
+Index: lxc/doc/lxc.conf.sgml.in
+===================================================================
+--- lxc.orig/doc/lxc.conf.sgml.in	2012-03-14 10:32:06.659876000 -0500
++++ lxc/doc/lxc.conf.sgml.in	2012-03-14 10:46:38.562522470 -0500
+@@ -410,6 +410,35 @@
+     </refsect2>
+ 
+     <refsect2>
++      <title>Console devices location</title>
++      <para>
++        LXC consoles are provided through Unix98 PTYs created on the
++	host and bind-mounted over the expected devices in the container.
++	By default, they are bind-mounted over <filename>/dev/console</filename>
++	and <filename>/dev/ttyN</filename>.  This can prevent package upgrades
++	in the guest.  Therefore you can specify a directory location (under
++	<filename>/dev</filename> under which LXC will create the files and
++	bind-mount over them.  These will then be symbolically linked to
++	<filename>/dev/console</filename> and <filename>/dev/ttyN</filename>.
++	A package upgrade can then succeed as it is able to remove and replace
++	the symbolic links.
++      </para>
++      <variablelist>
++	<varlistentry>
++	  <term>
++	    <option>lxc.devttydir</option>
++	  </term>
++	  <listitem>
++	    <para>
++	      Specify a directory under <filename>/dev</filename>
++	      under which to create the container console devices.
++	    </para>
++	  </listitem>
++	</varlistentry>
++      </variablelist>
++    </refsect2>
++
++    <refsect2>
+       <title>Mount points</title>
+       <para>
+ 	The mount points section specifies the different places to be

=== renamed file 'debian/patches/0057-update-manpages' => 'debian/patches/0057-update-manpages.moved'