[openwrt/openwrt] busybox: make username consistent

[LEDE Commits]

dangole pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/2e746b4d29cb4aa98b680a2797da3db66487a5ce

commit 2e746b4d29cb4aa98b680a2797da3db66487a5ce
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Sun Oct 25 17:24:03 2020 +0000

    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 <champetier.etienne at gmail.com>
    Signed-off-by: Daniel Golle <daniel at makrotopia.org>
---
 package/network/services/dnsmasq/files/dnsmasqsec_hotplug_acl.json | 2 +-
 package/utils/busybox/Makefile                                     | 2 +-
 package/utils/busybox/files/sysntpd                                | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/network/services/dnsmasq/files/dnsmasqsec_hotplug_acl.json b/package/network/services/dnsmasq/files/dnsmasqsec_hotplug_acl.json
index a5eac3943d..861ecbe034 100644
--- a/package/network/services/dnsmasq/files/dnsmasqsec_hotplug_acl.json
+++ b/package/network/services/dnsmasq/files/dnsmasqsec_hotplug_acl.json
@@ -1,5 +1,5 @@
 {
-	"user": "ntpd",
+	"user": "ntp",
 	"access": {
 		"service": {
 			"methods": [ "signal" ]
diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile
index 6d9a0088e5..25db4ff387 100644
--- a/package/utils/busybox/Makefile
+++ b/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
diff --git a/package/utils/busybox/files/sysntpd b/package/utils/busybox/files/sysntpd
index cbc760a48e..db5fc6c034 100755
--- a/package/utils/busybox/files/sysntpd
+++ b/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