aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2013-11-11 12:18:58 +0000
committerJohn Crispin <blogic@openwrt.org>2013-11-11 12:18:58 +0000
commit7a06fe0b425224ba24a6faf832c46846390a2c51 (patch)
tree980ced70d04e2827bf5fd57cb6bcf2613ae8bda7
parent032a4b965e485f86490504650e0f977d6d5c4b77 (diff)
downloadmaster-187ad058-7a06fe0b425224ba24a6faf832c46846390a2c51.tar.gz
master-187ad058-7a06fe0b425224ba24a6faf832c46846390a2c51.tar.bz2
master-187ad058-7a06fe0b425224ba24a6faf832c46846390a2c51.zip
uhttp: make sure that the ubus module is loaded when when installed
Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38723 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/network/services/uhttpd/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile
index 2ff2ff798c..be1a1e27f1 100644
--- a/package/network/services/uhttpd/Makefile
+++ b/package/network/services/uhttpd/Makefile
@@ -129,8 +129,9 @@ define Package/uhttpd-mod-lua/install
endef
define Package/uhttpd-mod-ubus/install
- $(INSTALL_DIR) $(1)/usr/lib
+ $(INSTALL_DIR) $(1)/usr/lib $(1)/etc/uci-defaults
$(INSTALL_BIN) $(PKG_BUILD_DIR)/uhttpd_ubus.so $(1)/usr/lib/
+ $(INSTALL_DATA) ./files/ubus.default $(1)/etc/uci-defaults/00_uhttpd_ubus
endef