Nanako/openwrt
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

busybox: sysntpd: make use of new ubus hotplug.ntp object

Browse Source 
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2021-01-01 12:45:48 +00:00
parent 3010f16f44
commit 29a6a71d52
4 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/utils/busybox/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=busybox PKG_NAME:=busybox
PKG_VERSION:=1.31.1 PKG_VERSION:=1.31.1
PKG_RELEASE:=8 PKG_RELEASE:=9
PKG_FLAGS:=essential PKG_FLAGS:=essential
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@ -145,8 +145,9 @@ endif
ifneq ($(CONFIG_BUSYBOX_$(BUSYBOX_SYM)_NTPD),) ifneq ($(CONFIG_BUSYBOX_$(BUSYBOX_SYM)_NTPD),)
$(INSTALL_BIN) ./files/sysntpd $(1)/etc/init.d/sysntpd $(INSTALL_BIN) ./files/sysntpd $(1)/etc/init.d/sysntpd
$(INSTALL_BIN) ./files/ntpd-hotplug $(1)/usr/sbin/ntpd-hotplug $(INSTALL_BIN) ./files/ntpd-hotplug $(1)/usr/sbin/ntpd-hotplug
$(INSTALL_DIR) $(1)/etc/capabilities/ $(INSTALL_DIR) $(1)/etc/capabilities $(1)/usr/share/acl.d
$(INSTALL_DATA) ./files/ntpd.capabilities $(1)/etc/capabilities/ntpd.json $(INSTALL_DATA) ./files/ntpd.capabilities $(1)/etc/capabilities/ntpd.json
$(INSTALL_DATA) ./files/ntpd_acl.json $(1)/usr/share/acl.d/ntpd.json
endif endif
-rm -rf $(1)/lib64 -rm -rf $(1)/lib64
endef endef

12
package/utils/busybox/files/ntpd-hotplug
View File

@ -1,2 +1,12 @@
#!/bin/sh #!/bin/sh
ACTION="$1" /sbin/hotplug-call ntp
. /usr/share/libubox/jshn.sh
addenv="$( env | while read line; do echo "json_add_string \"\" \"$line\";"; done )"
json_init
json_add_array env
json_add_string "" "ACTION=$1"
eval "$addenv"
json_close_array env
ubus call hotplug.ntp call "$(json_dump)"

8
package/utils/busybox/files/ntpd_acl.json Normal file
View File

@ -0,0 +1,8 @@
{
"user": "ntp",
"access": {
"hotplug.ntp": {
"methods": [ "call" ]
}
}
}

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

@ -56,7 +56,12 @@ start_ntpd_instance() {
done done
procd_set_param respawn procd_set_param respawn
[ -x /sbin/ujail -a -e /etc/capabilities/ntpd.json ] && { [ -x /sbin/ujail -a -e /etc/capabilities/ntpd.json ] && {
procd_add_jail ntpd procd_add_jail ntpd ubus
procd_add_jail_mount "$HOTPLUG_SCRIPT"
procd_add_jail_mount "/usr/share/libubox/jshn.sh"
procd_add_jail_mount "/usr/bin/env"
procd_add_jail_mount "/usr/bin/jshn"
procd_add_jail_mount "/bin/ubus"
procd_set_param capabilities /etc/capabilities/ntpd.json procd_set_param capabilities /etc/capabilities/ntpd.json
procd_set_param user ntp procd_set_param user ntp
procd_set_param group ntp procd_set_param group ntp