Merge pull request #458 from adrianschmutzler/fixcommit

batman-adv: Fix uci commit target

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index b250888e53988f44d5464a379bc0bebd6c8aae99..ed735eb5cc10ae9e89812cf7b4bde4b8d6bcb821 100644 (file)
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=batman-adv
 
 PKG_VERSION:=2019.0
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 PKG_HASH:=3e97d8a771cdbd7b2df42c52b88e071eaa58b5d28eb4e17a4b13b6698debbdc0
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

diff --git a/batman-adv/files/etc/uci-defaults/99-migrate-batadv_hardif b/batman-adv/files/etc/uci-defaults/99-migrate-batadv_hardif
index 156a33f80e900374eec38ddaf1ad7c564609526e..258b7bd6a58892fd02e257c4679dc46dbcf7adf7 100755 (executable)
--- a/batman-adv/files/etc/uci-defaults/99-migrate-batadv_hardif
+++ b/batman-adv/files/etc/uci-defaults/99-migrate-batadv_hardif
@@ -89,7 +89,7 @@ if [ -f /etc/config/batman-adv ]; then
 
     config_load batman-adv
     config_foreach mv_batadv_config_section 'mesh'
-    uci commit batman-adv
+    uci commit network
 
     rm -f /etc/config/batman-adv
 fi