document lxc.rebootsignal Also fix some minor indentation mishaps since we're here. Signed-off-by: Bogdan Purcareata <bogdan.purcareata@freescale.com> Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

lxc_*.c: don't exit with -1 In this patch I tried to stick with each file's coding style, however I think we should probably change that. Every main() should always not return and only exit; they should always return EXIT_SUCCESS or EXIT_FAILURE with the only exceptions being cases where we are returning a child's exit status (lxc_execute, lxc_attach, lxc_init). Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> Acked-by: Stéphane Graber <stgraber@ubuntu.com>

add lxc.haltsignal for soft shutdown - use this in the busybox template since busybox's init expects to receive SIGUSR1 to halt - fix lxc.stopsignal to be output by write_config so lxcapi_clone() and lxcapi_save_config() will output it Signed-off-by: Dwight Engen <dwight.engen@oracle.com> Acked-by: Stéphane Graber <stgraber@ubuntu.com>

rename lxc-stop shutdown argument to nokill This makes the arguments between lxc-stop and lxc-autostart more consistent, so that --shutdown doesn't have two different meanings. Signed-off-by: Dwight Engen <dwight.engen@oracle.com> Acked-by: Stéphane Graber <stgraber@ubuntu.com>

lxc-stop: don't set timeout if user requested -s A timeout means wait this long before killing the container. -s means don't kill the container. timeout defaults to 60 seconds. So if a shutdown is requested, then set timeout to 0. Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

stop: add nolock option If the system gets into a bad state, it may become impossible to get the lxc container locks. We should still be able to stop containers in that case. Add a -L/--nolock option to specify this behavior. Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> Acked-by: Stéphane Graber <stgraber@ubuntu.com>

doc: Remove unnecessary Diagnostic entry in lxc-stop(1) Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp> Acked-by: Stéphane Graber <stgraber@ubuntu.com>

licensing: Add missing headers and FSF address Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>

lxc-stop: use api, remove lxc_shutdown, extend lxc-stop functionality implement c->reboot(c) in the api. Also if the container is not running, return -2. Currently lxc-stop will return 0, so you cannot tell the difference between successfull stopping and noop. Per stgraber's email: - Remove lxc-shutdown - Change lxc-stop so that: * Default behaviour is to call shutdown(), wait 15s for STOPPED, if not STOPPED, print a message to the user and call stop() [ NOTE: actually 60 seconds per followup thread] * We have a -r option to reboot the container (with proper check that the container indeed rebooted within the next 15s) * We have a -s option to shutdown the container without the automatic fallback to stop() * Add a -k option allowing a user to just kill a container (equivalent to old lxc-stop, no shutdown() call and no delay). and update manpages. Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

fix building docs Commit 69fe23ff added checking for the older docbook2man back into configure, but this breaks building the docs on at least Oracle Linux and Fedora when docbook2X is not installed as docbook2man will be found but the docs don't actually build with that tool. This change makes it so the docs can be built with either the older docbook2man or the newer 2X tools by using configure to set the dtd string to an appropriate value depending on use of docbook2man or db2x_docbook2man. Also fixed a small error in lxc-destroy.sgml.in that was noticed by the old tools. Signed-off-by: Dwight Engen <dwight.engen@oracle.com> Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

Change author email address Signed-off-by: Daniel Lezcano <daniel.lezcano@free.fr>

Remove all trailing whitespaces. Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>

Update documentation to Docbook 4.5 The package 'docbook-tools' [1] required to format Docbook 3.0 into man pages has been obsoleted a long time ago and can no longer be downloaded from its former homepage. Recent versions of that package -- now called 'docbook2X' --, cannot deal with that old markup format anymore (and don't support the '-w all' command line switch either). To remedy these issues, all SGML files have been updated to Docbook 4.5 so that recent versions of docbook2man can process them. [1] http://sources.redhat.com/docbook-tools/ [2] http://docbook2x.sourceforge.net/ Signed-off-by: Peter Simons <simons@cryp.to> Acked-by: Stéphane Graber <stgraber@ubuntu.com>

Revert "Update documentation to Docbook 4.5" This reverts commit 9a84044bc97098821cce2721ea40a1368f17a091. The changes made the branch to fail to build on Ubuntu/Debian, so reverting the commits and re-opening the pull request. Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>

Update documentation to Docbook 4.5 The package 'docbook-tools' [1] required to format Docbook 3.0 into man pages has been obsoleted a long time ago and can no longer be downloaded from its former homepage. Recent versions of that package -- now called 'docbook2X' --, cannot deal with that old markup format anymore (and don't support the '-w all' command line switch either). To remedy these issues, all SGML files have been updated to Docbook 4.5 so that recent versions of docbook2man can process them. [1] http://sources.redhat.com/docbook-tools/ [2] http://docbook2x.sourceforge.net/ Signed-off-by: Peter Simons <simons@cryp.to>

lxc-doc-synopsis-args I was getting raw nroff ".SH DESCRIPTION" in my man pages. This fixes the synopsis cmd args so that doesn't happen. Added replaceable to a few arguments. Signed-off-by: Dwight Engen <dwight.engen@oracle.com>

change man pages to use a common file for common options the common options of lxc commands are now described in one file "common_options.sgml.in" Signed-off-by: Michel Normand <normand@fr.ibm.com> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

change man pages to use a seealso file for references the common references to lxc man pages are now placed in one file "see_also.sgml.in" Note that the few man pages that refer to man pages that are not lxc ones have two "See Also" paragraph. Signed-off-by: Michel Normand <normand@fr.ibm.com> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

Added the man.1 pages From: Daniel Lezcano <dlezcano@fr.ibm.com> Added the different man pages for the lxc commands. The generation of the man pages relies on the docbook tool. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>