From 0b31713c856a0d8c6fe2961113a9317f7c3659dc Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Thu, 22 Oct 2020 15:02:58 +0100 Subject: [PATCH] rpcd: adapt defaults for changed ubus.sock path Signed-off-by: Daniel Golle --- package/system/rpcd/Makefile | 4 +++- package/system/rpcd/files/50-migrate-rpcd-ubus-sock.sh | 6 ++++++ package/system/rpcd/files/rpcd.config | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100755 package/system/rpcd/files/50-migrate-rpcd-ubus-sock.sh diff --git a/package/system/rpcd/Makefile b/package/system/rpcd/Makefile index 051e4c5edddc..917ad6ff8660 100644 --- a/package/system/rpcd/Makefile +++ b/package/system/rpcd/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rpcd -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/rpcd.git @@ -63,6 +63,8 @@ define Package/rpcd/install $(INSTALL_DATA) $(PKG_BUILD_DIR)/unauthenticated.json $(1)/usr/share/rpcd/acl.d/unauthenticated.json $(INSTALL_DIR) $(1)/etc/config $(INSTALL_CONF) ./files/rpcd.config $(1)/etc/config/rpcd + $(INSTALL_DIR) $(1)/etc/uci-defaults + $(INSTALL_BIN) ./files/50-migrate-rpcd-ubus-sock.sh $(1)/etc/uci-defaults endef diff --git a/package/system/rpcd/files/50-migrate-rpcd-ubus-sock.sh b/package/system/rpcd/files/50-migrate-rpcd-ubus-sock.sh new file mode 100755 index 000000000000..1365aed39a93 --- /dev/null +++ b/package/system/rpcd/files/50-migrate-rpcd-ubus-sock.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +[ "$(uci get rpcd.@rpcd[0].socket)" = "/var/run/ubus.sock" ] && { + uci set rpcd.@rpcd[0].socket='/var/run/ubus/ubus.sock' + uci commit rpcd +} diff --git a/package/system/rpcd/files/rpcd.config b/package/system/rpcd/files/rpcd.config index faaed7f538d0..176c643f1728 100644 --- a/package/system/rpcd/files/rpcd.config +++ b/package/system/rpcd/files/rpcd.config @@ -1,5 +1,5 @@ config rpcd - option socket /var/run/ubus.sock + option socket /var/run/ubus/ubus.sock option timeout 30 config login -- 2.30.2