fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

busybox: make username consistent

Browse Source 
ntpd in packages feed had already a user 'ntp' with UID 123 declared.
Rename the username of busybox-ntpd to be 'ntp' instead of 'ntpd' so
it doesn't clash.

Reported-by: Etienne Champetier <champetier.etienne@gmail.com>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2020-10-25 17:24:03 +00:00 committed by CN_SZTL
parent e841f2be5a
commit 9956763094
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/utils/busybox/Makefile
View File

@ -50,7 +50,7 @@ define Package/busybox/Default
TITLE:=Core utilities for embedded Linux
URL:=http://busybox.net/
DEPENDS:=+BUSYBOX_CONFIG_PAM:libpam +BUSYBOX_CONFIG_NTPD:jsonfilter
USERID:=ntpd=123:ntpd=123
USERID:=ntp=123:ntp=123
endef
define Package/busybox

4
package/utils/busybox/files/sysntpd
View File

@ -58,8 +58,8 @@ start_ntpd_instance() {
[ -x /sbin/ujail ] && {
procd_add_jail ntpd
procd_set_param capabilities /etc/capabilities/ntpd.json
procd_set_param user ntpd
procd_set_param group ntpd
procd_set_param user ntp
procd_set_param group ntp
procd_set_param no_new_privs 1
}
procd_close_instance