Author: jow Date: 2015-12-03 22:12:51 +0100 (Thu, 03 Dec 2015) New Revision: 47728
Modified: trunk/package/base-files/files/lib/functions/uci-defaults-new.sh Log: base-files: uci-defaults-new.sh: fix for handling multiple ifnames Signed-off-by: Jo-Philipp Wich <[email protected]> Modified: trunk/package/base-files/files/lib/functions/uci-defaults-new.sh =================================================================== --- trunk/package/base-files/files/lib/functions/uci-defaults-new.sh 2015-12-03 21:08:28 UTC (rev 47727) +++ trunk/package/base-files/files/lib/functions/uci-defaults-new.sh 2015-12-03 21:12:51 UTC (rev 47728) @@ -166,11 +166,11 @@ json_select_object network json_select_object "$role" # attach previous interfaces (for multi-switch devices) - local prev_device; json_get_var prev_device ifname - if ! list_contains prev_device "$device"; then - device="${prev_device:+$prev_device }$device" + local devices; json_get_var devices ifname + if ! list_contains devices "$device"; then + devices="${devices:+$devices }$device" fi - json_add_string ifname "$device" + json_add_string ifname "$devices" json_select .. json_select .. done _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
