jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make sure the container is stopped before we try to start it

Browse source
This commit is contained in:
Simon Fels 2016-09-05 18:15:23 +01:00
commit 7285c2e4ed
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/anbox/container/lxc_container.cpp
View file

@ -57,8 +57,10 @@ void LxcContainer::start(const Configuration &configuration) {
if (getuid() != 0) if (getuid() != 0)
BOOST_THROW_EXCEPTION(std::runtime_error("You have to start the container as root")); BOOST_THROW_EXCEPTION(std::runtime_error("You have to start the container as root"));
if (container_ && container_->is_running(container_)) if (container_ && container_->is_running(container_)) {
BOOST_THROW_EXCEPTION(std::runtime_error("Container already started")); BOOST_THROW_EXCEPTION(std::runtime_error("Container already started, stopping it now"));
container_->stop(container_);
}
if (!container_) { if (!container_) {
DEBUG("Containers are stored in %s", config::container_config_path()); DEBUG("Containers are stored in %s", config::container_config_path());
@ -69,6 +71,11 @@ void LxcContainer::start(const Configuration &configuration) {
container_ = lxc_container_new("default", config::container_config_path().c_str()); container_ = lxc_container_new("default", config::container_config_path().c_str());
if (!container_) if (!container_)
BOOST_THROW_EXCEPTION(std::runtime_error("Failed to create LXC container instance")); BOOST_THROW_EXCEPTION(std::runtime_error("Failed to create LXC container instance"));
// If container is still running (for example after a crash) we stop it here to ensure
// its configuration is synchronized.
if (container_->is_running(container_))
container_->stop(container_);
} }
// We drop all not needed capabilities // We drop all not needed capabilities