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

Integrate review feedback

Browse source
This commit is contained in:
Simon Fels 2017-05-09 09:51:38 +02:00
commit 385bf94d51
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -38,6 +38,8 @@ 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 *proc_version_path{"/proc/version"};
constexpr const char *binder_path{"/dev/binder"}; constexpr const char *binder_path{"/dev/binder"};
constexpr const char *ashmem_path{"/dev/ashmem"}; constexpr const char *ashmem_path{"/dev/ashmem"};
constexpr const char *os_release_name{"NAME"};
constexpr const char *os_release_version{"VERSION"};
class SystemInformation { class SystemInformation {
public: public:
@ -94,7 +96,7 @@ class SystemInformation {
private: private:
void collect_os_info() { void collect_os_info() {
os_info_.snap_based = (getenv("SNAP") != nullptr); os_info_.snap_based = !anbox::utils::get_env_value("SNAP").empty();
fs::path path = os_release_path; fs::path path = os_release_path;
// If we're running from within a snap the best we can do is to // 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. // access the hostfs and read the os-release file from there.
@ -104,9 +106,9 @@ class SystemInformation {
// Double check that there aren't any permission errors when trying // Double check that there aren't any permission errors when trying
// to access the file (e.g. because of snap confinement) // to access the file (e.g. because of snap confinement)
if (fs::exists(path)) { if (fs::exists(path)) {
anbox::utils::EnvironmentFile os_release(os_release_path); anbox::utils::EnvironmentFile os_release(path);
os_info_.name = os_release.value("NAME"); os_info_.name = os_release.value(os_release_name);
os_info_.version = os_release.value("VERSION"); os_info_.version = os_release.value(os_release_version);
} }
} }