diff options
| author | Daniel Dickinson <lede@daniel.thecshore.com> | 2016-05-18 03:05:42 -0400 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2016-06-27 15:16:01 +0200 |
| commit | 4a3b8e05966e9883227eb0b6780c1bd9fe008d95 (patch) | |
| tree | deec62dfcaeca37791da5056e410488f7cac89ca /package/network/services/lldpd/patches | |
| parent | 6ee66ae0759234230958ff4c6b3ba92b26e85965 (diff) | |
| download | upstream-4a3b8e05966e9883227eb0b6780c1bd9fe008d95.tar.gz upstream-4a3b8e05966e9883227eb0b6780c1bd9fe008d95.tar.bz2 upstream-4a3b8e05966e9883227eb0b6780c1bd9fe008d95.zip | |
lldpd: Use /etc/os-release instead of /etc/openwrt_*
With the addition of /etc/os-release patching lldpd to use
/etc/openwrt_release and to have the initscript use
/etc/openwrt_release and/or /etc/openwrt_version becomes
unnecessary.
Signed-off-by: Daniel Dickinson <lede@daniel.thecshore.com>
Diffstat (limited to 'package/network/services/lldpd/patches')
| -rw-r--r-- | package/network/services/lldpd/patches/100-os-release.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/package/network/services/lldpd/patches/100-os-release.patch b/package/network/services/lldpd/patches/100-os-release.patch deleted file mode 100644 index a906f39f6e..0000000000 --- a/package/network/services/lldpd/patches/100-os-release.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: lldpd-0.7.15/src/daemon/lldpd.c -=================================================================== ---- lldpd-0.7.15.orig/src/daemon/lldpd.c -+++ lldpd-0.7.15/src/daemon/lldpd.c -@@ -736,6 +736,10 @@ lldpd_get_os_release() { - fp = fopen("/usr/lib/os-release", "r"); - } - if (!fp) { -+ log_debug("localchassis", "could not open /usr/lib/os-release"); -+ fp = fopen("/etc/openwrt_release", "r"); -+ } -+ if (!fp) { - log_info("localchassis", - "could not open either /etc/os-release or /usr/lib/os-release"); - return NULL; -@@ -745,7 +749,8 @@ lldpd_get_os_release() { - key = strtok(line, "="); - val = strtok(NULL, "="); - -- if (strncmp(key, "PRETTY_NAME", sizeof(line)) == 0) { -+ if (strncmp(key, "PRETTY_NAME", sizeof(line)) == 0 || -+ strncmp(key, "DISTRIB_DESCRIPTION", sizeof(line)) == 0) { - strlcpy(release, val, sizeof(line)); - break; - } -@@ -755,11 +760,11 @@ lldpd_get_os_release() { - /* Remove trailing newline and all " in the string. */ - ptr1 = release + strlen(release) - 1; - while (ptr1 != release && -- ((*ptr1 == '"') || (*ptr1 == '\n'))) { -+ ((*ptr1 == '"') || (*ptr1 == '\n') || (*ptr1 == '\''))) { - *ptr1 = '\0'; - ptr1--; - } -- if (release[0] == '"') -+ if (release[0] == '"' || release[0] == '\'') - return release+1; - return release; - } |