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

Read host os-release file when running inside the snap

Browse source
This commit is contained in:
Simon Fels 2017-05-09 07:20:56 +02:00
commit 41530325ec
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/anbox/cmds/system_info.cpp
View file

@ -34,6 +34,7 @@ namespace fs = boost::filesystem;
namespace {
constexpr const char *os_release_path{"/etc/os-release"};
constexpr const char *host_os_release_path{"/var/lib/snapd/hostfs/etc/os-release"};
constexpr const char *proc_version_path{"/proc/version"};
constexpr const char *binder_path{"/dev/binder"};
constexpr const char *ashmem_path{"/dev/ashmem"};
@ -94,14 +95,18 @@ class SystemInformation {
private:
void collect_os_info() {
os_info_.snap_based = (getenv("SNAP") != nullptr);
if (fs::exists(os_release_path)) {
fs::path path = os_release_path;
// If we're running from within a snap the best we can do is to
// access the hostfs and read the os-release file from there.
if (os_info_.snap_based && fs::exists(host_os_release_path))
path = host_os_release_path;
// Double check that there aren't any permission errors when trying
// to access the file (e.g. because of snap confinement)
if (fs::exists(path)) {
anbox::utils::EnvironmentFile os_release(os_release_path);
os_info_.name = os_release.value("NAME");
os_info_.version = os_release.value("VERSION");
} else if (os_info_.snap_based) {
// As we can't read /etc/os-release and we're snap-based this is the best we can guess
os_info_.name = "Ubuntu";
os_info_.version = "16";
}
}