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

container: update to LXC 3.0

Browse source
This commit is contained in:
Simon Fels 2018-05-25 09:14:29 +02:00
commit 51840062b1
2 changed files with 20 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
snap/snapcraft.yaml
View file

@ -102,7 +102,7 @@ parts:
lxc: lxc:
source: https://github.com/lxc/lxc source: https://github.com/lxc/lxc
source-type: git source-type: git
source-tag: lxc-2.0.7 source-tag: lxc-3.0.0
build-packages: build-packages:
- libapparmor-dev - libapparmor-dev
- libcap-dev - libcap-dev
@ -129,7 +129,7 @@ parts:
snap/anbox/current/libexec: libexec snap/anbox/current/libexec: libexec
prime: prime:
- lib/liblxc.so.1 - lib/liblxc.so.1
- lib/liblxc.so.1.2.0 - lib/liblxc.so.1.4.0
- libexec/lxc/lxc-monitord - libexec/lxc/lxc-monitord
- bin/lxc-start - bin/lxc-start
- bin/lxc-stop - bin/lxc-stop

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

@ -74,19 +74,19 @@ void LxcContainer::setup_id_map() {
const auto base_id = unprivileged_uid; const auto base_id = unprivileged_uid;
const auto max_id = 65536; const auto max_id = 65536;
set_config_item("lxc.id_map", utils::string_format("u 0 %d %d", base_id, creds_.uid() - 1)); set_config_item("lxc.idmap", utils::string_format("u 0 %d %d", base_id, creds_.uid() - 1));
set_config_item("lxc.id_map", utils::string_format("g 0 %d %d", base_id, creds_.gid() - 1)); set_config_item("lxc.idmap", utils::string_format("g 0 %d %d", base_id, creds_.gid() - 1));
// We need to bind the user id for the one running the client side // We need to bind the user id for the one running the client side
// process as he is the owner of various socket files we bind mount // process as he is the owner of various socket files we bind mount
// into the container. // into the container.
set_config_item("lxc.id_map", utils::string_format("u %d %d 1", android_system_uid, creds_.uid())); set_config_item("lxc.idmap", utils::string_format("u %d %d 1", android_system_uid, creds_.uid()));
set_config_item("lxc.id_map", utils::string_format("g %d %d 1", android_system_uid, creds_.gid())); set_config_item("lxc.idmap", utils::string_format("g %d %d 1", android_system_uid, creds_.gid()));
set_config_item("lxc.id_map", utils::string_format("u %d %d %d", android_system_uid + 1, set_config_item("lxc.idmap", utils::string_format("u %d %d %d", android_system_uid + 1,
base_id + android_system_uid + 1, base_id + android_system_uid + 1,
max_id - creds_.uid() - 1)); max_id - creds_.uid() - 1));
set_config_item("lxc.id_map", utils::string_format("g %d %d %d", android_system_uid + 1, set_config_item("lxc.idmap", utils::string_format("g %d %d %d", android_system_uid + 1,
base_id + android_system_uid + 1, base_id + android_system_uid + 1,
max_id - creds_.gid() - 1)); max_id - creds_.gid() - 1));
} }
@ -97,9 +97,9 @@ void LxcContainer::setup_network() {
return; return;
} }
set_config_item("lxc.network.type", "veth"); set_config_item("lxc.net.0.type", "veth");
set_config_item("lxc.network.flags", "up"); set_config_item("lxc.net.0.flags", "up");
set_config_item("lxc.network.link", "anbox0"); set_config_item("lxc.net.0.link", "anbox0");
// Instead of relying on DHCP we will give Android a static IP configuration // Instead of relying on DHCP we will give Android a static IP configuration
// for the virtual ethernet interface LXC creates for us. This will be bridged // for the virtual ethernet interface LXC creates for us. This will be bridged
@ -245,33 +245,32 @@ void LxcContainer::start(const Configuration &configuration) {
set_config_item("lxc.mount.auto", "proc:mixed sys:mixed cgroup:mixed"); set_config_item("lxc.mount.auto", "proc:mixed sys:mixed cgroup:mixed");
set_config_item("lxc.autodev", "1"); set_config_item("lxc.autodev", "1");
set_config_item("lxc.pts", "1024"); set_config_item("lxc.pty.max", "1024");
set_config_item("lxc.tty", "0"); set_config_item("lxc.tty.max", "0");
set_config_item("lxc.utsname", "anbox"); set_config_item("lxc.uts.name", "anbox");
set_config_item("lxc.group.devices.deny", ""); set_config_item("lxc.group.devices.deny", "");
set_config_item("lxc.group.devices.allow", ""); set_config_item("lxc.group.devices.allow", "");
// We can't move bind-mounts, so don't use /dev/lxc/ // We can't move bind-mounts, so don't use /dev/lxc/
set_config_item("lxc.devttydir", ""); set_config_item("lxc.tty.dir", "");
set_config_item("lxc.environment", set_config_item("lxc.environment",
"PATH=/system/bin:/system/sbin:/system/xbin"); "PATH=/system/bin:/system/sbin:/system/xbin");
set_config_item("lxc.init_cmd", "/anbox-init.sh"); set_config_item("lxc.init.cmd", "/anbox-init.sh");
set_config_item("lxc.rootfs.backend", "dir");
const auto rootfs_path = SystemConfiguration::instance().rootfs_dir(); const auto rootfs_path = SystemConfiguration::instance().rootfs_dir();
DEBUG("Using rootfs path %s", rootfs_path); DEBUG("Using rootfs path %s", rootfs_path);
set_config_item("lxc.rootfs", rootfs_path); set_config_item("lxc.rootfs.path", rootfs_path);
set_config_item("lxc.loglevel", "0"); set_config_item("lxc.log.level", "0");
const auto log_path = SystemConfiguration::instance().log_dir(); const auto log_path = SystemConfiguration::instance().log_dir();
set_config_item("lxc.logfile", utils::string_format("%s/container.log", log_path).c_str()); set_config_item("lxc.log.file", utils::string_format("%s/container.log", log_path).c_str());
setup_network(); setup_network();
set_config_item("lxc.aa_profile", "anbox-container"); set_config_item("lxc.apparmor.profile", "anbox-container");
if (!privileged_) if (!privileged_)
setup_id_map(); setup_id_map();