diff options
| author | John Crispin <blogic@openwrt.org> | 2014-10-08 03:45:30 +0200 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2014-10-08 03:45:30 +0200 |
| commit | d4042ec35eecb0d417af438a3cb80cc5b7d53ae7 (patch) | |
| tree | db4864a42da2eb6ea5b12fe9ad11549782eed212 /admin | |
| parent | 85695f4561e474a823347cdb2c7a9456d47c4cc6 (diff) | |
generic userid: use the new USERID api
recent changes in trunk allow us to specify the userid inside the openwrt makefile.
the info is stored int he meta data of the IPK contorl file and users are generated
by the new generic postinst trigger.
Signed-off-by: John Crispin <blogic@openwrt.org>
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/zabbix/Makefile | 1 | ||||
| -rw-r--r-- | admin/zabbix/files/zabbix_agentd.init | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/admin/zabbix/Makefile b/admin/zabbix/Makefile index 6d4d77965..1b8a97fb4 100644 --- a/admin/zabbix/Makefile +++ b/admin/zabbix/Makefile @@ -32,6 +32,7 @@ define Package/zabbix/Default URL:=http://www.zabbix.com/ SUBMENU:=zabbix MAINTAINER:=Etienne CHAMPETIER <champetier.etienne@gmail.com> + USERID:=zabbix=53:zabbix=53 endef define Package/zabbix-agent diff --git a/admin/zabbix/files/zabbix_agentd.init b/admin/zabbix/files/zabbix_agentd.init index ed9acabb9..c806a9f0b 100644 --- a/admin/zabbix/files/zabbix_agentd.init +++ b/admin/zabbix/files/zabbix_agentd.init @@ -19,8 +19,6 @@ start() { } grep -q "^AllowRoot=1" ${CONFIG} || { - user_exists zabbix 53 || user_add zabbix 53 - group_exists zabbix 53 || group_add zabbix 53 touch ${SERVICE_PID_FILE} chown zabbix:zabbix ${SERVICE_PID_FILE} } |