Author: nbd Date: 2016-01-25 17:30:41 +0100 (Mon, 25 Jan 2016) New Revision: 48493
Added: trunk/package/base-files/files/etc/board.d/ trunk/package/base-files/files/etc/board.d/99-default_network Removed: trunk/package/base-files/files/etc/config/network trunk/target/linux/adm8668/base-files.mk trunk/target/linux/ar71xx/base-files.mk trunk/target/linux/arc770/base-files.mk trunk/target/linux/at91/base-files.mk trunk/target/linux/bcm53xx/base-files.mk trunk/target/linux/brcm2708/base-files.mk trunk/target/linux/brcm47xx/base-files.mk trunk/target/linux/brcm63xx/base-files.mk trunk/target/linux/imx6/base-files.mk trunk/target/linux/ipq806x/base-files.mk trunk/target/linux/kirkwood/base-files.mk trunk/target/linux/lantiq/base-files.mk trunk/target/linux/malta/base-files.mk trunk/target/linux/mediatek/base-files.mk trunk/target/linux/mpc85xx/base-files.mk trunk/target/linux/mvebu/base-files.mk trunk/target/linux/netlogic/base-files.mk trunk/target/linux/octeon/base-files.mk trunk/target/linux/oxnas/base-files.mk trunk/target/linux/ramips/base-files.mk trunk/target/linux/sunxi/base-files.mk Log: base-files: remove default /etc/config/network, generate it via board.d instead Signed-off-by: Felix Fietkau <[email protected]> Copied: trunk/package/base-files/files/etc/board.d/99-default_network (from rev 48492, trunk/target/linux/mxs/base-files/etc/board.d/02_network) =================================================================== --- trunk/package/base-files/files/etc/board.d/99-default_network (rev 0) +++ trunk/package/base-files/files/etc/board.d/99-default_network 2016-01-25 16:30:41 UTC (rev 48493) @@ -0,0 +1,17 @@ +#!/bin/sh +# +# Copyright (C) 2013-2015 OpenWrt.org +# + +. /lib/functions/uci-defaults.sh + +board_config_update + +json_is_a network object && exit 0 + +ucidef_set_interface_lan 'eth0' +[ -d /sys/class/net/eth1 ] && ucidef_set_interface_wan 'eth1' + +board_config_flush + +exit 0 Deleted: trunk/package/base-files/files/etc/config/network =================================================================== --- trunk/package/base-files/files/etc/config/network 2016-01-25 15:49:49 UTC (rev 48492) +++ trunk/package/base-files/files/etc/config/network 2016-01-25 16:30:41 UTC (rev 48493) @@ -1,18 +0,0 @@ -# Copyright (C) 2006 OpenWrt.org - -config interface loopback - option ifname lo - option proto static - option ipaddr 127.0.0.1 - option netmask 255.0.0.0 - -config interface lan - option ifname eth0 - option type bridge - option proto static - option ipaddr 192.168.1.1 - option netmask 255.255.255.0 - option ip6assign 60 - -config globals globals - option ula_prefix auto Deleted: trunk/target/linux/adm8668/base-files.mk =================================================================== --- trunk/target/linux/adm8668/base-files.mk 2016-01-25 15:49:49 UTC (rev 48492) +++ trunk/target/linux/adm8668/base-files.mk 2016-01-25 16:30:41 UTC (rev 48493) @@ -1,3 +0,0 @@ -#define Package/base-files/install-target -# rm -f $(1)/etc/config/network -#endef Deleted: trunk/target/linux/ar71xx/base-files.mk =================================================================== --- trunk/target/linux/ar71xx/base-files.mk 2016-01-25 15:49:49 UTC (rev 48492) +++ trunk/target/linux/ar71xx/base-files.mk 2016-01-25 16:30:41 UTC (rev 48493) @@ -1,3 +0,0 @@ -define Package/base-files/install-target - rm -f $(1)/etc/config/network -endef Deleted: trunk/target/linux/arc770/base-files.mk =================================================================== --- trunk/target/linux/arc770/base-files.mk 2016-01-25 15:49:49 UTC (rev 48492) +++ trunk/target/linux/arc770/base-files.mk 2016-01-25 16:30:41 UTC (rev 48493) @@ -1,3 +0,0 @@ -define Package/base-files/install-target - rm -f $(1)/etc/config/network -endef Deleted: trunk/target/linux/at91/base-files.mk =================================================================== --- trunk/target/linux/at91/base-files.mk 2016-01-25 15:49:49 UTC (rev 48492) +++ trunk/target/linux/at91/base-files.mk 2016-01-25 16:30:41 UTC (rev 48493) @@ -1,5 +0,0 @@ -define Package/base-files/install-target - rm -f $(1)/etc/config/network -endef - - Deleted: trunk/target/linux/bcm53xx/base-files.mk =================================================================== --- trunk/target/linux/bcm53xx/base-files.mk 2016-01-25 15:49:49 UTC (rev 48492) +++ trunk/target/linux/bcm53xx/base-files.mk 2016-01-25 16:30:41 UTC (rev 48493) @@ -1,3 +0,0 @@ -define Package/base-files/install-target - rm -f $(1)/etc/config/network -endef Deleted: trunk/target/linux/brcm2708/base-files.mk =================================================================== --- trunk/target/linux/brcm2708/base-files.mk 2016-01-25 15:49:49 UTC (rev 48492) +++ trunk/target/linux/brcm2708/base-files.mk 2016-01-25 16:30:41 UTC (rev 48493) @@ -1,3 +0,0 @@ -define Package/base-files/install-target - rm -f $(1)/etc/config/network -endef Deleted: trunk/target/linux/brcm47xx/base-files.mk =================================================================== --- trunk/target/linux/brcm47xx/base-files.mk 2016-01-25 15:49:49 UTC (rev 48492) +++ trunk/target/linux/brcm47xx/base-files.mk 2016-01-25 16:30:41 UTC (rev 48493) @@ -1,5 +0,0 @@ -define Package/base-files/install-target - rm -f $(1)/etc/config/network -endef - - Deleted: trunk/target/linux/brcm63xx/base-files.mk =================================================================== --- trunk/target/linux/brcm63xx/base-files.mk 2016-01-25 15:49:49 UTC (rev 48492) +++ trunk/target/linux/brcm63xx/base-files.mk 2016-01-25 16:30:41 UTC (rev 48493) @@ -1,5 +0,0 @@ -define Package/base-files/install-target - rm -f $(1)/etc/config/network -endef - - Deleted: trunk/target/linux/imx6/base-files.mk =================================================================== --- trunk/target/linux/imx6/base-files.mk 2016-01-25 15:49:49 UTC (rev 48492) +++ trunk/target/linux/imx6/base-files.mk 2016-01-25 16:30:41 UTC (rev 48493) @@ -1,3 +0,0 @@ -define Package/base-files/install-target - rm -f $(1)/etc/config/network -endef Deleted: trunk/target/linux/ipq806x/base-files.mk =================================================================== --- trunk/target/linux/ipq806x/base-files.mk 2016-01-25 15:49:49 UTC (rev 48492) +++ trunk/target/linux/ipq806x/base-files.mk 2016-01-25 16:30:41 UTC (rev 48493) @@ -1,3 +0,0 @@ -define Package/base-files/install-target - rm -f $(1)/etc/config/network -endef Deleted: trunk/target/linux/kirkwood/base-files.mk =================================================================== --- trunk/target/linux/kirkwood/base-files.mk 2016-01-25 15:49:49 UTC (rev 48492) +++ trunk/target/linux/kirkwood/base-files.mk 2016-01-25 16:30:41 UTC (rev 48493) @@ -1,3 +0,0 @@ -define Package/base-files/install-target - rm -f $(1)/etc/config/network -endef Deleted: trunk/target/linux/lantiq/base-files.mk =================================================================== --- trunk/target/linux/lantiq/base-files.mk 2016-01-25 15:49:49 UTC (rev 48492) +++ trunk/target/linux/lantiq/base-files.mk 2016-01-25 16:30:41 UTC (rev 48493) @@ -1,5 +0,0 @@ -define Package/base-files/install-target - rm -f $(1)/etc/config/network -endef - - Deleted: trunk/target/linux/malta/base-files.mk =================================================================== --- trunk/target/linux/malta/base-files.mk 2016-01-25 15:49:49 UTC (rev 48492) +++ trunk/target/linux/malta/base-files.mk 2016-01-25 16:30:41 UTC (rev 48493) @@ -1,3 +0,0 @@ -define Package/base-files/install-target - rm -f $(1)/etc/config/network -endef Deleted: trunk/target/linux/mediatek/base-files.mk =================================================================== --- trunk/target/linux/mediatek/base-files.mk 2016-01-25 15:49:49 UTC (rev 48492) +++ trunk/target/linux/mediatek/base-files.mk 2016-01-25 16:30:41 UTC (rev 48493) @@ -1,3 +0,0 @@ -define Package/base-files/install-target - rm -f $(1)/etc/config/network -endef Deleted: trunk/target/linux/mpc85xx/base-files.mk =================================================================== --- trunk/target/linux/mpc85xx/base-files.mk 2016-01-25 15:49:49 UTC (rev 48492) +++ trunk/target/linux/mpc85xx/base-files.mk 2016-01-25 16:30:41 UTC (rev 48493) @@ -1,5 +0,0 @@ -define Package/base-files/install-target - rm -f $(1)/etc/config/network -endef - - Deleted: trunk/target/linux/mvebu/base-files.mk =================================================================== --- trunk/target/linux/mvebu/base-files.mk 2016-01-25 15:49:49 UTC (rev 48492) +++ trunk/target/linux/mvebu/base-files.mk 2016-01-25 16:30:41 UTC (rev 48493) @@ -1,3 +0,0 @@ -define Package/base-files/install-target - rm -f $(1)/etc/config/network -endef Deleted: trunk/target/linux/netlogic/base-files.mk =================================================================== --- trunk/target/linux/netlogic/base-files.mk 2016-01-25 15:49:49 UTC (rev 48492) +++ trunk/target/linux/netlogic/base-files.mk 2016-01-25 16:30:41 UTC (rev 48493) @@ -1,5 +0,0 @@ -define Package/base-files/install-target - rm -f $(1)/etc/config/network -endef - - Deleted: trunk/target/linux/octeon/base-files.mk =================================================================== --- trunk/target/linux/octeon/base-files.mk 2016-01-25 15:49:49 UTC (rev 48492) +++ trunk/target/linux/octeon/base-files.mk 2016-01-25 16:30:41 UTC (rev 48493) @@ -1,3 +0,0 @@ -define Package/base-files/install-target - rm -f $(1)/etc/config/network -endef Deleted: trunk/target/linux/oxnas/base-files.mk =================================================================== --- trunk/target/linux/oxnas/base-files.mk 2016-01-25 15:49:49 UTC (rev 48492) +++ trunk/target/linux/oxnas/base-files.mk 2016-01-25 16:30:41 UTC (rev 48493) @@ -1,3 +0,0 @@ -define Package/base-files/install-target - rm -f $(1)/etc/config/network -endef Deleted: trunk/target/linux/ramips/base-files.mk =================================================================== --- trunk/target/linux/ramips/base-files.mk 2016-01-25 15:49:49 UTC (rev 48492) +++ trunk/target/linux/ramips/base-files.mk 2016-01-25 16:30:41 UTC (rev 48493) @@ -1,5 +0,0 @@ -define Package/base-files/install-target - rm -f $(1)/etc/config/network -endef - - Deleted: trunk/target/linux/sunxi/base-files.mk =================================================================== --- trunk/target/linux/sunxi/base-files.mk 2016-01-25 15:49:49 UTC (rev 48492) +++ trunk/target/linux/sunxi/base-files.mk 2016-01-25 16:30:41 UTC (rev 48493) @@ -1,3 +0,0 @@ -define Package/base-files/install-target - rm -f $(1)/etc/config/network -endef _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
