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

container: use cgroup snap-confine already setup

Browse source
This commit is contained in:
Simon Fels 2018-07-19 22:22:03 -04:00
commit 643ede2b90
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -266,6 +266,11 @@ void LxcContainer::start(const Configuration &configuration) {
set_config_item("lxc.init.cmd", "/anbox-init.sh"); set_config_item("lxc.init.cmd", "/anbox-init.sh");
// If we're running inside the snap environment snap-confine already created a
// cgroup for us we need to use as otherwise presevering a namespace wont help.
if (utils::is_env_set("SNAP"))
set_config_item("lxc.namespace.keep", "cgroup");
auto rootfs_path = SystemConfiguration::instance().rootfs_dir(); auto rootfs_path = SystemConfiguration::instance().rootfs_dir();
if (rootfs_overlay_) if (rootfs_overlay_)
rootfs_path = SystemConfiguration::instance().combined_rootfs_dir(); rootfs_path = SystemConfiguration::instance().combined_rootfs_dir();