[openwrt/openwrt] uhttpd: Execute uci commit and reload_config once
LEDE Commits
lede-commits at lists.infradead.org
Sun Mar 21 21:54:49 GMT 2021
hauke pushed a commit to openwrt/openwrt.git, branch openwrt-21.02:
https://git.openwrt.org/741260d2816c8a989553a19685988cc906f43259
commit 741260d2816c8a989553a19685988cc906f43259
Author: Hauke Mehrtens <hauke at hauke-m.de>
AuthorDate: Sat Mar 20 13:26:20 2021 +0100
uhttpd: Execute uci commit and reload_config once
Instead of doing uci commit and reload_config for each setting do it
only once when one of these options was changed. This should make it a
little faster when both conditions are taken.
Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
(cherry picked from commit 501221af542b5154fbf8788f8426bc7f5443764a)
---
package/network/services/uhttpd/files/ubus.default | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/package/network/services/uhttpd/files/ubus.default b/package/network/services/uhttpd/files/ubus.default
index b218d3f85d..474016c1c5 100644
--- a/package/network/services/uhttpd/files/ubus.default
+++ b/package/network/services/uhttpd/files/ubus.default
@@ -1,15 +1,17 @@
#!/bin/sh
+commit=0
+
if [ -z "$(uci -q get uhttpd.main.ubus_prefix)" ]; then
uci set uhttpd.main.ubus_prefix=/ubus
- uci commit uhttpd
- /etc/init.d/uhttpd reload
+ commit=1
fi
[ "$(uci -q get uhttpd.main.ubus_socket)" = "/var/run/ubus.sock" ] && {
uci set uhttpd.main.ubus_socket='/var/run/ubus/ubus.sock'
- uci commit uhttpd
- /etc/init.d/uhttpd reload
+ commit=1
}
+[ "$commit" = 1 ] && uci commit uhttpd && /etc/init.d/uhttpd reload
+
exit 0
More information about the lede-commits
mailing list