busybox: make username consistent

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 <[email protected]>
Signed-off-by: Daniel Golle <[email protected]>

package/network/services/dnsmasq/files/dnsmasqsec_hotplug_acl.json

@@ -1,5 +1,5 @@
 {
-	"user": "ntpd",
+	"user": "ntp",
 	"access": {
 		"service": {
 			"methods": [ "signal" ]

package/utils/busybox/Makefile

@@ -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

package/utils/busybox/files/sysntpd

@@ -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