Remove release-info option

This is distribution creator editorial choice, not a user choice.

Signed-off-by: Tim Pepper <timothy.c.pepper@linux.intel.com>

diff --git a/corewatcher.conf b/corewatcher.conf
index 8f0c40a..5bc54a4 100644 (file)
--- a/corewatcher.conf
+++ b/corewatcher.conf
@@ -41,12 +41,6 @@ allow-pass-on=yes
 submit-url=http://kojibuild7.jf.intel.com/crash_submit/
 
 #
-# Location for the distribution's build release file
-#
-
-release-info=/etc/os-release
-
-#
 # Location to store coredumps after they are processed
 #
 

diff --git a/src/configfile.c b/src/configfile.c
index ab3b503..1bfcb0c 100644 (file)
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -80,15 +80,6 @@ void read_config_file(char *filename)
                                }
                        }
                }
-               c = strstr(line, "release-info");
-               if (c) {
-                       c += 11;
-                       if (c < line_end) {
-                               c = strstr(c, "/");
-                               if (c)
-                                       build_release = strdup(c);
-                       }
-               }
                c = strstr(line, "core-folder");
                if (c) {
                        c += 11;
@@ -103,8 +94,6 @@ void read_config_file(char *filename)
        fclose(file);
        free(line);
 
-       if (!build_release)
-               build_release = strdup("/etc/os-release");
        if (!url_count) {
                submit_url[url_count] = strdup("http://kojibuild7.jf.intel.com/crash_submit/");
                if (!submit_url[url_count])
@@ -114,4 +103,7 @@ void read_config_file(char *filename)
        }
        if (!core_folder)
                core_folder = strdup("/var/lib/corewatcher/");
+
+       /* Distribution editorial choice, not end-user choice: */
+       build_release = strdup("/etc/os-release");
 }