From: Daniel Golle <daniel@makrotopia.org>
Date: Mon, 19 Oct 2020 16:00:26 +0000 (+0100)
Subject: jail: adapt to new ubus socket path
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=12a5b97711b74efa72eae328c1e73b8fdfb76d74;p=project%2Fprocd.git

jail: adapt to new ubus socket path

The previous commit
3121467 ("early: run ubusd non-root as user ubus, group ubus")
changed the path of the ubus socket from /var/run/ubus.sock to
/var/run/ubus/ubus.sock. Adapt jail to also mount-bind that new
path for jails which include ubus access (eg. dnsmasq).

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

diff --git a/jail/jail.c b/jail/jail.c
index 0a2f978..ec2ec95 100644
--- a/jail/jail.c
+++ b/jail/jail.c
@@ -2366,7 +2366,7 @@ int main(int argc, char **argv)
 {
 	uid_t uid = getuid();
 	const char log[] = "/dev/log";
-	const char ubus[] = "/var/run/ubus.sock";
+	const char ubus[] = "/var/run/ubus/ubus.sock";
 	int ch, ret;
 
 	if (uid) {