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

Move runtime sockets etc. into SNAP_USER_COMMON / SNAP_COMMON

Browse source
This commit is contained in:
Simon Fels 2018-05-18 17:27:39 +02:00
commit 07fe3c7bac
1 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/anbox/system_configuration.cpp
View file

@ -30,9 +30,14 @@ namespace {
static std::string runtime_dir() { static std::string runtime_dir() {
static std::string path; static std::string path;
if (path.empty()) { if (path.empty()) {
path = anbox::utils::get_env_value("XDG_RUNTIME_DIR", ""); const auto snap_user_common = anbox::utils::get_env_value("SNAP_USER_COMMON");
if (path.empty()) if (!snap_user_common.empty())
BOOST_THROW_EXCEPTION(std::runtime_error("No runtime directory specified")); path = (fs::path(snap_user_common) / "runtime").string();
else {
path = anbox::utils::get_env_value("XDG_RUNTIME_DIR");
if (path.empty())
BOOST_THROW_EXCEPTION(std::runtime_error("No runtime directory specified"));
}
} }
return path; return path;
} }
@ -59,7 +64,15 @@ std::string anbox::SystemConfiguration::container_config_dir() const {
} }
std::string anbox::SystemConfiguration::container_socket_path() const { std::string anbox::SystemConfiguration::container_socket_path() const {
return "/run/anbox-container.socket"; static std::string path;
if (path.empty()) {
const auto snap_common = anbox::utils::get_env_value("SNAP_COMMON");
if (!snap_common.empty())
path = (fs::path(snap_common) / "sockets" / "anbox-container.socket").string();
else
path = "/run/anbox-container.socket";
}
return path;
} }
std::string anbox::SystemConfiguration::socket_dir() const { std::string anbox::SystemConfiguration::socket_dir() const {