diff options
| author | Sven Eckelmann <sven@narfation.org> | 2019-06-16 09:27:08 +0200 |
|---|---|---|
| committer | Sven Eckelmann <sven@narfation.org> | 2019-06-16 09:29:42 +0200 |
| commit | e87a25f4083976c8ab6bfacdf41c6a3cec05a91d (patch) | |
| tree | 215d6309270c3a0f3242a3bd44f1a727a80d6e96 /batman-adv | |
| parent | 67875e2069c3f5d1688ca4040e98edc4bad547f5 (diff) | |
batman-adv: Don't try to set unconfigured ap_isolation for vlan
The ap_isolation setting only supports boolean values. So setting an empty
string as ap_isolation is not supported by batctl.
Fixes: f5205d7d2434 ("batman-adv: upgrade package to latest release 2014.2.0")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Diffstat (limited to 'batman-adv')
| -rw-r--r-- | batman-adv/Makefile | 2 | ||||
| -rwxr-xr-x | batman-adv/files/lib/netifd/proto/batadv_vlan.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/batman-adv/Makefile b/batman-adv/Makefile index 84f2274..b84475a 100644 --- a/batman-adv/Makefile +++ b/batman-adv/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv PKG_VERSION:=2019.2 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_HASH:=70c3f6a6cf88d2b25681a76768a52ed92d9fe992ba8e358368b6a8088757adc8 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/batman-adv/files/lib/netifd/proto/batadv_vlan.sh b/batman-adv/files/lib/netifd/proto/batadv_vlan.sh index d6d00ad..b4835f6 100755 --- a/batman-adv/files/lib/netifd/proto/batadv_vlan.sh +++ b/batman-adv/files/lib/netifd/proto/batadv_vlan.sh @@ -5,7 +5,7 @@ init_proto "$@" proto_batadv_vlan_init_config() { - proto_config_add_string "ap_isolation" + proto_config_add_boolean 'ap_isolation:bool' } proto_batadv_vlan_setup() { @@ -17,7 +17,7 @@ proto_batadv_vlan_setup() { json_get_vars ap_isolation - batctl -m "$iface" ap_isolation "$ap_isolation" + [ -n "$ap_isolation" ] && batctl -m "$iface" ap_isolation "$ap_isolation" proto_init_update "$iface" 1 proto_send_update "$config" } |