Browse Source

rpcd: remove file when applied

Make sure exit value of this script is zero. Or the file won't be deleted.

Signed-off-by: Huangbin Zhan <[email protected]>
Huangbin Zhan 5 years ago
parent
commit
86917e4979

+ 1 - 1
package/system/rpcd/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rpcd
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/rpcd.git

+ 6 - 4
package/system/rpcd/files/50-migrate-rpcd-ubus-sock.sh

@@ -1,6 +1,8 @@
 #!/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
-}
+[ "$(uci get rpcd.@rpcd[0].socket)" = "/var/run/ubus.sock" ] || exit 0
+
+uci set rpcd.@rpcd[0].socket='/var/run/ubus/ubus.sock'
+uci commit rpcd
+
+exit 0