ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-01-21 03:55:06 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

rpcd: adapt defaults for changed ubus.sock path

Browse Source 
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Signed-off-by: maurerr <mariusd84@gmail.com>
This commit is contained in:
Daniel Golle 2020-10-22 15:02:58 +01:00 committed by maurerr
parent 0d9ac0d089
commit a642dff039
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/system/rpcd/Makefile
View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=rpcd PKG_NAME:=rpcd
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/rpcd.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_DATA) $(PKG_BUILD_DIR)/unauthenticated.json $(1)/usr/share/rpcd/acl.d/unauthenticated.json
$(INSTALL_DIR) $(1)/etc/config $(INSTALL_DIR) $(1)/etc/config
$(INSTALL_CONF) ./files/rpcd.config $(1)/etc/config/rpcd $(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 endef

6
package/system/rpcd/files/50-migrate-rpcd-ubus-sock.sh Executable file
View File

@ -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
}

2
package/system/rpcd/files/rpcd.config
View File

@ -1,5 +1,5 @@
config rpcd config rpcd
option socket /var/run/ubus.sock option socket /var/run/ubus/ubus.sock
option timeout 30 option timeout 30
config login config login