← Back to branch summary

~serge-hallyn/ubuntu/natty/lxc/lxc-fix-3bugs

« back to all changes in this revision

Viewing changes to src/lxc/stop.c

  • Committer: Bazaar Package Importer
  • Author(s): Guido Trotter
  • Date: 2010-08-04 13:23:42 UTC
  • mfrom: (1.1.5 upstream) (3.1.6 sid)
  • Revision ID: james.westby@ubuntu.com-20100804132342-ds4lm3oaroeoxfxx
Tags: 0.7.2-1
http://bugs.debian.org/571527
http://bugs.debian.org/587847
http://bugs.debian.org/573830
* New upstream version
* Convert libcap dependency to versioned (closes: #571527)
* Bump up standards version to 3.9.0
* Fix too-deep /usr/lib/lxc/lxc path (closes: #587847)
* Add init script (closes: #573830)
  Thanks to Przemysław Knycz <pknycz@kolnet.eu> for the base example
* Bump up standards version (3.9.1)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/lxc/stop.c
35
35
#include <lxc/log.h>
36
36
#include <lxc/start.h>
37
37
 
 
38
#include "lxc.h"
38
39
#include "commands.h"
39
40
 
40
41
lxc_log_define(lxc_stop, lxc);
83
84
        int ret;
84
85
 
85
86
        answer.ret = kill(handler->pid, SIGKILL);
86
 
        if (!answer.ret)
87
 
                return 0;
 
87
        if (!answer.ret) {
 
88
                ret = lxc_unfreeze(handler->name);
 
89
                if (!ret)
 
90
                        return 0;
 
91
 
 
92
                ERROR("failed to unfreeze container");
 
93
                answer.ret = ret;
 
94
        }
88
95
 
89
96
        ret = send(fd, &answer, sizeof(answer), 0);
90
97
        if (ret < 0) {