Author: jow Date: 2015-11-25 16:43:33 +0100 (Wed, 25 Nov 2015) New Revision: 47646
Modified: trunk/package/base-files/files/bin/config_generate Log: base-files: config_generate: properly handle multiple switches Signed-off-by: Jo-Philipp Wich <[email protected]> Modified: trunk/package/base-files/files/bin/config_generate =================================================================== --- trunk/package/base-files/files/bin/config_generate 2015-11-25 15:43:28 UTC (rev 47645) +++ trunk/package/base-files/files/bin/config_generate 2015-11-25 15:43:33 UTC (rev 47646) @@ -172,6 +172,16 @@ eval device="\$dev$((vlan_off++ % n_cpu))" [ $n_vlan -gt $n_cpu ] && device="$device.$vlan_off" + # quirk: append ifnames for subsequent switches + case "$switch" in switch[1-9]) + local prev_devs="$(uci -q get "network.$role.ifname")" + if echo "$prev_devs" | grep -wq "$device"; then + device="$prev_devs" + else + device="$prev_devs $device" + fi + ;; esac + uci -q batch <<-EOF delete network.$role set network.$role='interface' _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
