rpcd: adapt defaults for changed ubus.sock path

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

diff --git a/package/system/rpcd/Makefile b/package/system/rpcd/Makefile
index 051e4c5edddc769da3970b56e4ca2514be1800b8..917ad6ff86604fd08a1dd881f2f25a8c66924642 100644 (file)
--- 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 (executable)
index 0000000..1365aed
--- /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 faaed7f538d090a43b8380e27ecda128c0025e85..176c643f17284e34652897dd4cdd62d0103f1ca4 100644 (file)
--- 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