From: John Crispin <john@openwrt.org>
Date: Thu, 11 Sep 2014 12:28:22 +0000 (+0000)
Subject: lldp: remove calls to user/group_add/exists
X-Git-Tag: reboot~6011
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5920eac8eeba0d689c7af9389aea2e2f46eec9ce;p=openwrt%2Fstaging%2Fnoltari.git

lldp: remove calls to user/group_add/exists

use the new ipkg based mechanism

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 42472
---

diff --git a/package/network/services/lldpd/Makefile b/package/network/services/lldpd/Makefile
index 31367833ec..0b858483be 100644
--- a/package/network/services/lldpd/Makefile
+++ b/package/network/services/lldpd/Makefile
@@ -31,6 +31,7 @@ define Package/lldpd
   TITLE:=Link Layer Discovery Protocol daemon
   URL:=https://github.com/vincentbernat/lldpd/wiki
   DEPENDS:=+libevent2 +USE_EGLIBC:libbsd
+  USERID:=lldp:lldp
 endef
 
 define Package/lldpd/description
diff --git a/package/network/services/lldpd/files/lldpd.init b/package/network/services/lldpd/files/lldpd.init
index 35999501f9..b2eea70fd3 100644
--- a/package/network/services/lldpd/files/lldpd.init
+++ b/package/network/services/lldpd/files/lldpd.init
@@ -50,9 +50,6 @@ start() {
 	[ $enable_sonmp -gt 0 ] && append args '-s'
 	[ $enable_edp -gt 0 ] && append args '-e'
 
-	user_exists  lldp 121 || user_add  lldp 121 129
-	group_exists lldp 129 || group_add lldp 129
-
 	mkdir -p /var/run/lldp
 	chown lldp:lldp /var/run/lldp