]> git.ipfire.org Git - thirdparty/lxc.git/commit
lxc-stop: use api, remove lxc_shutdown, extend lxc-stop functionality
authorSerge Hallyn <serge.hallyn@ubuntu.com>
Thu, 16 May 2013 21:03:47 +0000 (23:03 +0200)
committerSerge Hallyn <serge.hallyn@ubuntu.com>
Sat, 25 May 2013 04:31:28 +0000 (23:31 -0500)
commit3e625e2d2e12b919dd9590b97badc6108ee67b1a
tree373fec3683e6d1a3b915747f2f880e3f96bc932b
parent5cee8c5040661f9875bf41cfffd641c87afae8af
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>
configure.ac
doc/Makefile.am
doc/lxc-shutdown.sgml.in [deleted file]
doc/lxc-stop.sgml.in
src/lxc/Makefile.am
src/lxc/arguments.h
src/lxc/lxc-shutdown.in [deleted file]
src/lxc/lxc_stop.c
src/lxc/lxccontainer.c
src/lxc/lxccontainer.h