From: Daniel Golle <daniel@makrotopia.org>
Date: Fri, 27 Nov 2020 23:45:54 +0000 (+0000)
Subject: busybox: add check for capabilities file
X-Git-Tag: v21.02.0-rc1~939
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=aa6fe00a4804c782b2ad4afc894ea62109bc8d91;p=openwrt%2Fopenwrt.git

busybox: add check for capabilities file

Similar to the previous commit adding a check to the init script of
umdns, do a similar change for sysntpd, just to be on the safe side.

Inspired-by: 520403cd49 ("umdns: add check for seccomp list")

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---

diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile
index 71bd888c71..38ef4d33bd 100644
--- a/package/utils/busybox/Makefile
+++ b/package/utils/busybox/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=busybox
 PKG_VERSION:=1.31.1
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 PKG_FLAGS:=essential
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/package/utils/busybox/files/sysntpd b/package/utils/busybox/files/sysntpd
index db5fc6c034..19571a2306 100755
--- a/package/utils/busybox/files/sysntpd
+++ b/package/utils/busybox/files/sysntpd
@@ -55,7 +55,7 @@ start_ntpd_instance() {
 		procd_append_param command -p $peer
 	done
 	procd_set_param respawn
-	[ -x /sbin/ujail ] && {
+	[ -x /sbin/ujail -a -e /etc/capabilities/ntpd.json ] && {
 		procd_add_jail ntpd
 		procd_set_param capabilities /etc/capabilities/ntpd.json
 		procd_set_param user ntp