base-files: remove default /etc/config/network, generate it via board.d instead

Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 48493
9 years ago · 57776e68ce
parent 1d2c63c455
commit 57776e68ce
23 changed files with 17 additions and 95 deletions
--- a/package/base-files/files/etc/board.d/99-default_network
+++ b/package/base-files/files/etc/board.d/99-default_network
@ -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
--- a/package/base-files/files/etc/config/network
+++ b/package/base-files/files/etc/config/network
@ -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
--- a/target/linux/adm8668/base-files.mk
+++ b/target/linux/adm8668/base-files.mk
@ -1,3 +0,0 @@
 #define Package/base-files/install-target
 #	rm -f $(1)/etc/config/network
 #endef
--- a/target/linux/ar71xx/base-files.mk
+++ b/target/linux/ar71xx/base-files.mk
@ -1,3 +0,0 @@
 define Package/base-files/install-target
 	rm -f $(1)/etc/config/network
 endef
--- a/target/linux/arc770/base-files.mk
+++ b/target/linux/arc770/base-files.mk
@ -1,3 +0,0 @@
 define Package/base-files/install-target
 	rm -f $(1)/etc/config/network
 endef
--- a/target/linux/at91/base-files.mk
+++ b/target/linux/at91/base-files.mk
@ -1,5 +0,0 @@
 define Package/base-files/install-target
 	rm -f $(1)/etc/config/network
 endef
--- a/target/linux/bcm53xx/base-files.mk
+++ b/target/linux/bcm53xx/base-files.mk
@ -1,3 +0,0 @@
 define Package/base-files/install-target
 	rm -f $(1)/etc/config/network
 endef
--- a/target/linux/brcm2708/base-files.mk
+++ b/target/linux/brcm2708/base-files.mk
@ -1,3 +0,0 @@
 define Package/base-files/install-target
 	rm -f $(1)/etc/config/network
 endef
--- a/target/linux/brcm47xx/base-files.mk
+++ b/target/linux/brcm47xx/base-files.mk
@ -1,5 +0,0 @@
 define Package/base-files/install-target
 	rm -f $(1)/etc/config/network
 endef
--- a/target/linux/brcm63xx/base-files.mk
+++ b/target/linux/brcm63xx/base-files.mk
@ -1,5 +0,0 @@
 define Package/base-files/install-target
 	rm -f $(1)/etc/config/network
 endef
--- a/target/linux/imx6/base-files.mk
+++ b/target/linux/imx6/base-files.mk
@ -1,3 +0,0 @@
 define Package/base-files/install-target
 	rm -f $(1)/etc/config/network
 endef
--- a/target/linux/ipq806x/base-files.mk
+++ b/target/linux/ipq806x/base-files.mk
@ -1,3 +0,0 @@
 define Package/base-files/install-target
 	rm -f $(1)/etc/config/network
 endef
--- a/target/linux/kirkwood/base-files.mk
+++ b/target/linux/kirkwood/base-files.mk
@ -1,3 +0,0 @@
 define Package/base-files/install-target
 	rm -f $(1)/etc/config/network
 endef
--- a/target/linux/lantiq/base-files.mk
+++ b/target/linux/lantiq/base-files.mk
@ -1,5 +0,0 @@
 define Package/base-files/install-target
 	rm -f $(1)/etc/config/network
 endef
--- a/target/linux/malta/base-files.mk
+++ b/target/linux/malta/base-files.mk
@ -1,3 +0,0 @@
 define Package/base-files/install-target
 	rm -f $(1)/etc/config/network
 endef
--- a/target/linux/mediatek/base-files.mk
+++ b/target/linux/mediatek/base-files.mk
@ -1,3 +0,0 @@
 define Package/base-files/install-target
 	rm -f $(1)/etc/config/network
 endef
--- a/target/linux/mpc85xx/base-files.mk
+++ b/target/linux/mpc85xx/base-files.mk
@ -1,5 +0,0 @@
 define Package/base-files/install-target
 	rm -f $(1)/etc/config/network
 endef
--- a/target/linux/mvebu/base-files.mk
+++ b/target/linux/mvebu/base-files.mk
@ -1,3 +0,0 @@
 define Package/base-files/install-target
 	rm -f $(1)/etc/config/network
 endef
--- a/target/linux/netlogic/base-files.mk
+++ b/target/linux/netlogic/base-files.mk
@ -1,5 +0,0 @@
 define Package/base-files/install-target
 	rm -f $(1)/etc/config/network
 endef
--- a/target/linux/octeon/base-files.mk
+++ b/target/linux/octeon/base-files.mk
@ -1,3 +0,0 @@
 define Package/base-files/install-target
 	rm -f $(1)/etc/config/network
 endef
--- a/target/linux/oxnas/base-files.mk
+++ b/target/linux/oxnas/base-files.mk
@ -1,3 +0,0 @@
 define Package/base-files/install-target
 	rm -f $(1)/etc/config/network
 endef
--- a/target/linux/ramips/base-files.mk
+++ b/target/linux/ramips/base-files.mk
@ -1,5 +0,0 @@
 define Package/base-files/install-target
 	rm -f $(1)/etc/config/network
 endef
--- a/target/linux/sunxi/base-files.mk
+++ b/target/linux/sunxi/base-files.mk
@ -1,3 +0,0 @@
 define Package/base-files/install-target
 	rm -f $(1)/etc/config/network
 endef