Author: nbd Date: 2015-04-16 14:18:34 +0200 (Thu, 16 Apr 2015) New Revision: 45458
Added: trunk/target/linux/bcm53xx/base-files/etc/board.d/ trunk/target/linux/bcm53xx/base-files/etc/board.d/02_network Removed: trunk/target/linux/bcm53xx/base-files/etc/uci-defaults/02_network Log: bcm53xx: make use of the new board detection layer Signed-off-by: Felix Fietkau <[email protected]> Copied: trunk/target/linux/bcm53xx/base-files/etc/board.d/02_network (from rev 45457, trunk/target/linux/bcm53xx/base-files/etc/uci-defaults/02_network) =================================================================== --- trunk/target/linux/bcm53xx/base-files/etc/board.d/02_network (rev 0) +++ trunk/target/linux/bcm53xx/base-files/etc/board.d/02_network 2015-04-16 12:18:34 UTC (rev 45458) @@ -0,0 +1,35 @@ +#!/bin/sh +# +# Copyright (C) 2011 OpenWrt.org +# + +. /lib/functions/uci-defaults-new.sh + +board_config_update + +ucidef_set_interface_loopback + +ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" +ucidef_add_switch "switch0" "1" "1" + +vlan1ports="$(nvram get vlan1ports)" +vlan2ports="$(nvram get vlan2ports)" +if echo "$vlan1ports" | egrep -q "^1 2 3 4 5" && \ + echo "$vlan2ports" | egrep -q "^0 5"; then + ucidef_add_switch_vlan "switch0" "1" "1 2 3 4 5t" + ucidef_add_switch_vlan "switch0" "2" "0 5t" +elif echo "$vlan1ports" | egrep -q "^0 1 2 3 5 7 8" && \ + echo "$vlan2ports" | egrep -q "^4 8"; then + ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5 7 8t" + ucidef_add_switch_vlan "switch0" "2" "4 8t" +else + # This also handles some funcy (e.g. R6250) configs like: + # vlan1ports=3 2 1 0 5* + # vlan2ports=4 5u + ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5t" + ucidef_add_switch_vlan "switch0" "2" "4 5t" +fi + +board_config_flush + +exit 0 Property changes on: trunk/target/linux/bcm53xx/base-files/etc/board.d/02_network ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Deleted: trunk/target/linux/bcm53xx/base-files/etc/uci-defaults/02_network =================================================================== --- trunk/target/linux/bcm53xx/base-files/etc/uci-defaults/02_network 2015-04-16 12:18:26 UTC (rev 45457) +++ trunk/target/linux/bcm53xx/base-files/etc/uci-defaults/02_network 2015-04-16 12:18:34 UTC (rev 45458) @@ -1,37 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2011 OpenWrt.org -# - -[ -e /etc/config/network ] && exit 0 - -touch /etc/config/network - -. /lib/functions/uci-defaults.sh - -ucidef_set_interface_loopback - -ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" -ucidef_add_switch "switch0" "1" "1" - -vlan1ports="$(nvram get vlan1ports)" -vlan2ports="$(nvram get vlan2ports)" -if echo "$vlan1ports" | egrep -q "^1 2 3 4 5" && \ - echo "$vlan2ports" | egrep -q "^0 5"; then - ucidef_add_switch_vlan "switch0" "1" "1 2 3 4 5t" - ucidef_add_switch_vlan "switch0" "2" "0 5t" -elif echo "$vlan1ports" | egrep -q "^0 1 2 3 5 7 8" && \ - echo "$vlan2ports" | egrep -q "^4 8"; then - ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5 7 8t" - ucidef_add_switch_vlan "switch0" "2" "4 8t" -else - # This also handles some funcy (e.g. R6250) configs like: - # vlan1ports=3 2 1 0 5* - # vlan2ports=4 5u - ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5t" - ucidef_add_switch_vlan "switch0" "2" "4 5t" -fi - -uci commit network - -exit 0 _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
