tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-05 21:04:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make --version work with systemd

Browse Source 
fixes #8888
This commit is contained in:
Jean-Marcel Flach 2015-04-20 12:51:19 +02:00
parent 9ae8a09b7e
commit 0eead93c69
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/base/application.cpp
View File

@ -489,18 +489,37 @@ static String UnameHelper(char type)
static String LsbReleaseHelper(void) static String LsbReleaseHelper(void)
{ {
String result = "Could not get release string";
FILE *fp = popen("lsb_release -s -d 2>&1", "r"); FILE *fp = popen("lsb_release -s -d 2>&1", "r");
char line[1024];
std::ostringstream msgbuf; std::ostringstream msgbuf;
if (fp != NULL) {
char line[1024];
while (fgets(line, sizeof(line), fp) != NULL) while (fgets(line, sizeof(line), fp) != NULL)
msgbuf << line; msgbuf << line;
pclose(fp); int status = pclose(fp);
String result = msgbuf.str(); if (WEXITSTATUS(status) == 0) {
result = msgbuf.str();
result.Trim(); result.Trim();
return result;
}
}
std::ifstream release("/etc/os-release");
if (!release.is_open())
return result;
std::string release_line;
while (getline(release, release_line)) {
if (release_line.find("PRETTY_NAME") != std::string::npos) {
result = release_line.substr(13, release_line.length()-14);
break;
}
}
release.close();
return result; return result;
} }