There is a new convention, used by systemd and supported by most
distributions, to put basic OS release information in /etc/os-release.

Signed-off-by: Ben Hutchings <[email protected]>
Signed-off-by: K. Y. Srinivasan <[email protected]>
Cc: [email protected]
---
 tools/hv/hv_kvp_daemon.c |   50 +++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
index 3922abc..77a8413 100644
--- a/tools/hv/hv_kvp_daemon.c
+++ b/tools/hv/hv_kvp_daemon.c
@@ -465,15 +465,59 @@ void kvp_get_os_info(void)
        if (p)
                *p = '\0';
 
+       /*
+        * Parse the /etc/os-release file if present:
+        * http://www.freedesktop.org/software/systemd/man/os-release.html
+        */
+       file = fopen("/etc/os-release", "r");
+       if (file != NULL) {
+               while (fgets(buf, sizeof(buf), file)) {
+                       char *value, *q;
+
+                       /* Ignore comments */
+                       if (buf[0] == '#')
+                               continue;
+
+                       /* Split into name=value */
+                       p = strchr(buf, '=');
+                       if (!p)
+                               continue;
+                       *p++ = 0;
+
+                       /* Remove quotes and newline; un-escape */
+                       value = p;
+                       q = p;
+                       while (*p) {
+                               if (*p == '\\') {
+                                       ++p;
+                                       if (!*p)
+                                               break;
+                                       *q++ = *p++;
+                               } else if (*p == '\'' || *p == '"' ||
+                                          *p == '\n') {
+                                       ++p;
+                               } else {
+                                       *q++ = *p++;
+                               }
+                       }
+                       *q = 0;
+
+                       if (!strcmp(buf, "NAME"))
+                               os_name = strdup(value);
+                       else if (!strcmp(buf, "VERSION_ID"))
+                               os_major = strdup(value);
+               }
+               fclose(file);
+               return;
+       }
+
+       /* Fallback for older RH/SUSE releases */
        file = fopen("/etc/SuSE-release", "r");
        if (file != NULL)
                goto kvp_osinfo_found;
        file  = fopen("/etc/redhat-release", "r");
        if (file != NULL)
                goto kvp_osinfo_found;
-       /*
-        * Add code for other supported platforms.
-        */
 
        /*
         * We don't have information about the os.
-- 
1.7.4.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to