From: Baptiste Jonglez Date: Fri, 29 Aug 2014 06:51:29 +0000 (+0200) Subject: babeld: Support default interface configuration X-Git-Url: http://git.openwrt.org/?p=feed%2Frouting.git;a=commitdiff_plain;h=8ff7cde48fb4e021c19e9c666bd50adb8f614292 babeld: Support default interface configuration When a "section interface" does not have a "option ifname", all its options are used as default interface options. --- diff --git a/babeld/files/babeld.init b/babeld/files/babeld.init index cb98e39..d6a6f1e 100755 --- a/babeld/files/babeld.init +++ b/babeld/files/babeld.init @@ -110,10 +110,12 @@ babel_config_cb() { option_cb() { local option="$1" local value="$2" + local _interface # "option ifname" is a special option, don't actually # generate configuration for it. [ "$option" = "ifname" ] && return - cfg_append "interface $interface ${option//_/-} $value" + [ -n "$interface" ] && _interface="interface $interface" || _interface="default" + cfg_append "$_interface ${option//_/-} $value" } # Handle ignore options. local _ignored @@ -126,7 +128,7 @@ babel_config_cb() { else # Also include an empty "interface $interface" statement, # so that babeld operates on this interface. - cfg_append "interface $interface" + [ -n "$interface" ] && cfg_append "interface $interface" fi ;; *)