From 4a3b8e05966e9883227eb0b6780c1bd9fe008d95 Mon Sep 17 00:00:00 2001 From: Daniel Dickinson Date: Wed, 18 May 2016 03:05:42 -0400 Subject: 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 --- package/network/services/lldpd/files/lldpd.init | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'package/network/services/lldpd/files') diff --git a/package/network/services/lldpd/files/lldpd.init b/package/network/services/lldpd/files/lldpd.init index 633a8fbc07..16a6db3cca 100644 --- a/package/network/services/lldpd/files/lldpd.init +++ b/package/network/services/lldpd/files/lldpd.init @@ -10,11 +10,11 @@ LLDPSOCKET=/var/run/lldpd.socket find_release_info() { - [ -s /etc/openwrt_release ] && . /etc/openwrt_release - [ -z "$DISTRIB_DESCRIPTION" ] && [ -s /etc/openwrt_version ] && \ - DISTRIB_DESCRIPTION="$(cat /etc/openwrt_version)" + [ -s /etc/os-release ] && . /etc/os-release + [ -z "$PRETTY_NAME" ] && [ -s /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() { -- cgit v1.2.3