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/files | |
| 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/files')
| -rw-r--r-- | package/network/services/lldpd/files/lldpd.init | 8 |
1 files changed, 4 insertions, 4 deletions
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() { |