From 936762f3fb6cf10e0756719f03aebe052d5c31a8 Mon Sep 17 00:00:00 2001 From: Bogdan Purcareata Date: Mon, 16 Feb 2015 09:38:35 +0000 Subject: [PATCH] document lxc.rebootsignal Also fix some minor indentation mishaps since we're here. Signed-off-by: Bogdan Purcareata Acked-by: Serge E. Hallyn --- 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 bc5e6a8ee..3c69feda5 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 lxc.stopsignal - (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 lxc.rebootsignal (defaults to SIGINT) to the + container's init process. The -W, -r, diff --git a/doc/lxc.container.conf.sgml.in b/doc/lxc.container.conf.sgml.in index 50c6a2a7c..aceeb1e12 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 Halt signal - 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. - - - - - - - specify the signal used to halt the container - - - + + + + + + + specify the signal used to halt the container + + + + + + + + Reboot signal + + 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. + + + + + + + + + specify the signal used to reboot the container + + + Stop signal - 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. - - - - - - - - - specify the signal used to stop the container - - - + 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. + + + + + + + + + specify the signal used to stop the container + + + @@ -211,16 +233,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Defaults to: /sbin/init - - - - - - - Absolute path from container rootfs to the binary to use as init. - - - + + + + + + + Absolute path from container rootfs to the binary to use as init. + + + -- 2.47.2