domenico/openwrt-R7800-nss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lldpd: Use /etc/os-release instead of /etc/openwrt_*

Browse Source 
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>
This commit is contained in:
Daniel Dickinson
2016-05-18 03:05:42 -04:00
committed by Jo-Philipp Wich
parent 6ee66ae075
commit 4a3b8e0596
2 changed files with 4 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
package/network/services/lldpd/files/lldpd.init
View File

@@ -10,11 +10,11 @@ LLDPSOCKET=/var/run/lldpd.socket
find_release_info() find_release_info()
{ {
[ -s /etc/openwrt_release ] && . /etc/openwrt_release [ -s /etc/os-release ] && . /etc/os-release
[ -z "$DISTRIB_DESCRIPTION" ] && [ -s /etc/openwrt_version ] && \ [ -z "$PRETTY_NAME" ] && [ -s /etc/openwrt_version ] && \
DISTRIB_DESCRIPTION="$(cat /etc/openwrt_version)" PRETTY_NAME="$(cat /etc/openwrt_version)"
echo "${DISTRIB_DESCRIPTION:-Unknown Lede release} @ $(cat /proc/sys/kernel/hostname)" echo "${PRETTY_NAME:-Unknown Lede release} @ $(cat /proc/sys/kernel/hostname)"
} }
start_service() { start_service() {

39
package/network/services/lldpd/patches/100-os-release.patch
View File

@@ -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;
}