diff --git a/alfred/Makefile b/alfred/Makefile index aa43b67..c135508 100644 --- a/alfred/Makefile +++ b/alfred/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alfred PKG_VERSION:=2019.3 -PKG_RELEASE:=0 +PKG_RELEASE:=2 PKG_HASH:=a4c37920de497701680abb55c49cdcd11e4e7135e0e7e79259c35492a3df4766 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/alfred/files/alfred.config b/alfred/files/alfred.config index 9d3fff6..704adf1 100644 --- a/alfred/files/alfred.config +++ b/alfred/files/alfred.config @@ -1,5 +1,5 @@ config 'alfred' 'alfred' - option interface 'br-lan' + list interface 'br-lan' option mode 'master' option batmanif 'bat0' option start_vis '1' diff --git a/alfred/files/alfred.init b/alfred/files/alfred.init index 89e33ab..0c35e65 100755 --- a/alfred/files/alfred.init +++ b/alfred/files/alfred.init @@ -54,10 +54,17 @@ wait_for_ll_address() { exit 1 } +append_interface() +{ + append "interfaces" "$1" "," + wait_for_ll_address "$1" +} + alfred_start() { local args="" local section="$1" local disabled interface mode + local interfaces # check if section is disabled config_get_bool disabled "$section" disabled 0 @@ -65,8 +72,12 @@ alfred_start() { args="" - config_get interface "$section" interface - append args "-i $interface" + config_list_foreach "$section" "interface" append_interface + if [ -z "$interfaces" ]; then + config_get interface "$section" interface + append_interface "$interface" + fi + append args "-i $interfaces" config_get mode "$section" mode [ "$mode" = "master" ] && append args "-m" @@ -75,11 +86,9 @@ alfred_start() { append args "-b $batmanif" if [ "$batmanif" != "none" ]; then - wait_for_dir "$batmanif" "/sys/class/net/$batmanif/mesh" + wait_for_dir "$batmanif" "/sys/devices/virtual/net/$batmanif" fi - wait_for_ll_address "$interface" - append alfred_args "$args" enable=1