[lxc-devel] [PATCH 2/3] document lxc.rebootsignal

[Serge Hallyn]

Quoting Bogdan Purcareata (bogdan.purcareata at freescale.com):
> Also fix some minor indentation mishaps since we're here.
> 
> Signed-off-by: Bogdan Purcareata <bogdan.purcareata at freescale.com>

Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>

> ---
>  doc/lxc-stop.sgml.in           |   4 +-
>  doc/lxc.container.conf.sgml.in | 106 +++++++++++++++++++++++++----------------
>  2 files changed, 67 insertions(+), 43 deletions(-)
> 
> diff --git a/doc/lxc-stop.sgml.in b/doc/lxc-stop.sgml.in
> index bc5e6a8..3c69fed 100644
> --- a/doc/lxc-stop.sgml.in
> +++ b/doc/lxc-stop.sgml.in
> @@ -70,7 +70,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
>        the container's init process, waiting up to 60 seconds for the container
>        to exit, and then returning. If the container fails to cleanly exit in
>        60 seconds, it will be sent the <command>lxc.stopsignal</command>
> -      (defaults to SIGKILL) to force it to shut down.
> +      (defaults to SIGKILL) to force it to shut down. A request to reboot will
> +      send the <command>lxc.rebootsignal</command> (defaults to SIGINT) to the
> +      container's init process.
>      </para>
>  	<para>
>  	The <optional>-W</optional>, <optional>-r</optional>,
> diff --git a/doc/lxc.container.conf.sgml.in b/doc/lxc.container.conf.sgml.in
> index 50c6a2a..aceeb1e 100644
> --- a/doc/lxc.container.conf.sgml.in
> +++ b/doc/lxc.container.conf.sgml.in
> @@ -158,46 +158,68 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
>      <refsect2>
>        <title>Halt signal</title>
>        <para>
> -    Allows one to specify signal name or number, sent by lxc-stop to the
> -    container's init process to cleanly shutdown the container. Different
> -    init systems could use different signals to perform clean shutdown
> -    sequence. This option allows the signal to be specified in kill(1)
> -    fashion, e.g. SIGPWR, SIGRTMIN+14, SIGRTMAX-10 or plain number. The
> -    default signal is SIGPWR.
> +        Allows one to specify signal name or number, sent by lxc-stop to the
> +        container's init process to cleanly shutdown the container. Different
> +        init systems could use different signals to perform clean shutdown
> +        sequence. This option allows the signal to be specified in kill(1)
> +        fashion, e.g. SIGPWR, SIGRTMIN+14, SIGRTMAX-10 or plain number. The
> +        default signal is SIGPWR.
>        </para>
>        <variablelist>
> -    <varlistentry>
> -      <term>
> -        <option>lxc.haltsignal</option>
> -      </term>
> -      <listitem>
> -        <para>
> -          specify the signal used to halt the container
> -        </para>
> -      </listitem>
> -    </varlistentry>
> +        <varlistentry>
> +          <term>
> +            <option>lxc.haltsignal</option>
> +          </term>
> +          <listitem>
> +            <para>
> +              specify the signal used to halt the container
> +            </para>
> +          </listitem>
> +        </varlistentry>
> +      </variablelist>
> +    </refsect2>
> +
> +    <refsect2>
> +      <title>Reboot signal</title>
> +      <para>
> +        Allows one to specify signal name or number, sent by lxc-stop to
> +        reboot the container. This option allows signal to be specified in
> +        kill(1) fashion, e.g. SIGTERM, SIGRTMIN+14, SIGRTMAX-10 or plain number.
> +        The default signal is SIGINT.
> +          </para>
> +          <variablelist>
> +        <varlistentry>
> +          <term>
> +            <option>lxc.rebootsignal</option>
> +          </term>
> +          <listitem>
> +            <para>
> +              specify the signal used to reboot the container
> +            </para>
> +          </listitem>
> +        </varlistentry>
>        </variablelist>
>      </refsect2>
>  
>      <refsect2>
>        <title>Stop signal</title>
>        <para>
> -    Allows one to specify signal name or number, sent by lxc-stop to forcibly
> -    shutdown the container. This option allows signal to be specified in
> -    kill(1) fashion, e.g. SIGKILL, SIGRTMIN+14, SIGRTMAX-10 or plain number.
> -    The default signal is SIGKILL.
> -      </para>
> -      <variablelist>
> -    <varlistentry>
> -      <term>
> -        <option>lxc.stopsignal</option>
> -      </term>
> -      <listitem>
> -        <para>
> -          specify the signal used to stop the container
> -        </para>
> -      </listitem>
> -    </varlistentry>
> +        Allows one to specify signal name or number, sent by lxc-stop to forcibly
> +        shutdown the container. This option allows signal to be specified in
> +        kill(1) fashion, e.g. SIGKILL, SIGRTMIN+14, SIGRTMAX-10 or plain number.
> +        The default signal is SIGKILL.
> +          </para>
> +          <variablelist>
> +        <varlistentry>
> +          <term>
> +            <option>lxc.stopsignal</option>
> +          </term>
> +          <listitem>
> +            <para>
> +              specify the signal used to stop the container
> +            </para>
> +          </listitem>
> +        </varlistentry>
>        </variablelist>
>      </refsect2>
>  
> @@ -211,16 +233,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
>          Defaults to: /sbin/init
>        </para>
>        <variablelist>
> -    <varlistentry>
> -      <term>
> -        <option>lxc.init_cmd</option>
> -      </term>
> -      <listitem>
> -        <para>
> -          Absolute path from container rootfs to the binary to use as init.
> -        </para>
> -      </listitem>
> -    </varlistentry>
> +        <varlistentry>
> +          <term>
> +            <option>lxc.init_cmd</option>
> +          </term>
> +          <listitem>
> +            <para>
> +              Absolute path from container rootfs to the binary to use as init.
> +            </para>
> +          </listitem>
> +        </varlistentry>
>        </variablelist>
>      </refsect2>
>  
> -- 
> 2.1.4
> 
> _______________________________________________
> lxc-devel mailing list
> lxc-devel at lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel