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

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 48493

diff --git a/package/base-files/files/etc/board.d/99-default_network b/package/base-files/files/etc/board.d/99-default_network
new file mode 100755 (executable)
index 0000000..d70aa35
--- /dev/null
+++ 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

diff --git a/package/base-files/files/etc/config/network b/package/base-files/files/etc/config/network
deleted file mode 100644 (file)
index d3cd3c6..0000000
--- a/package/base-files/files/etc/config/network
+++ /dev/null
@@ -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

diff --git a/target/linux/adm8668/base-files.mk b/target/linux/adm8668/base-files.mk
deleted file mode 100644 (file)
index a096236..0000000
--- a/target/linux/adm8668/base-files.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#define Package/base-files/install-target
-#      rm -f $(1)/etc/config/network
-#endef

diff --git a/target/linux/ar71xx/base-files.mk b/target/linux/ar71xx/base-files.mk
deleted file mode 100644 (file)
index fdd2c71..0000000
--- a/target/linux/ar71xx/base-files.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-define Package/base-files/install-target
-       rm -f $(1)/etc/config/network
-endef

diff --git a/target/linux/arc770/base-files.mk b/target/linux/arc770/base-files.mk
deleted file mode 100644 (file)
index fdd2c71..0000000
--- a/target/linux/arc770/base-files.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-define Package/base-files/install-target
-       rm -f $(1)/etc/config/network
-endef

diff --git a/target/linux/at91/base-files.mk b/target/linux/at91/base-files.mk
deleted file mode 100644 (file)
index d6682bd..0000000
--- a/target/linux/at91/base-files.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-define Package/base-files/install-target
-       rm -f $(1)/etc/config/network
-endef
-
-

diff --git a/target/linux/bcm53xx/base-files.mk b/target/linux/bcm53xx/base-files.mk
deleted file mode 100644 (file)
index fdd2c71..0000000
--- a/target/linux/bcm53xx/base-files.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-define Package/base-files/install-target
-       rm -f $(1)/etc/config/network
-endef

diff --git a/target/linux/brcm2708/base-files.mk b/target/linux/brcm2708/base-files.mk
deleted file mode 100644 (file)
index fdd2c71..0000000
--- a/target/linux/brcm2708/base-files.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-define Package/base-files/install-target
-       rm -f $(1)/etc/config/network
-endef

diff --git a/target/linux/brcm47xx/base-files.mk b/target/linux/brcm47xx/base-files.mk
deleted file mode 100644 (file)
index d6682bd..0000000
--- a/target/linux/brcm47xx/base-files.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-define Package/base-files/install-target
-       rm -f $(1)/etc/config/network
-endef
-
-

diff --git a/target/linux/brcm63xx/base-files.mk b/target/linux/brcm63xx/base-files.mk
deleted file mode 100644 (file)
index d6682bd..0000000
--- a/target/linux/brcm63xx/base-files.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-define Package/base-files/install-target
-       rm -f $(1)/etc/config/network
-endef
-
-

diff --git a/target/linux/imx6/base-files.mk b/target/linux/imx6/base-files.mk
deleted file mode 100644 (file)
index fdd2c71..0000000
--- a/target/linux/imx6/base-files.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-define Package/base-files/install-target
-       rm -f $(1)/etc/config/network
-endef

diff --git a/target/linux/ipq806x/base-files.mk b/target/linux/ipq806x/base-files.mk
deleted file mode 100644 (file)
index fdd2c71..0000000
--- a/target/linux/ipq806x/base-files.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-define Package/base-files/install-target
-       rm -f $(1)/etc/config/network
-endef

diff --git a/target/linux/kirkwood/base-files.mk b/target/linux/kirkwood/base-files.mk
deleted file mode 100644 (file)
index fdd2c71..0000000
--- a/target/linux/kirkwood/base-files.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-define Package/base-files/install-target
-       rm -f $(1)/etc/config/network
-endef

diff --git a/target/linux/lantiq/base-files.mk b/target/linux/lantiq/base-files.mk
deleted file mode 100644 (file)
index d6682bd..0000000
--- a/target/linux/lantiq/base-files.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-define Package/base-files/install-target
-       rm -f $(1)/etc/config/network
-endef
-
-

diff --git a/target/linux/malta/base-files.mk b/target/linux/malta/base-files.mk
deleted file mode 100644 (file)
index fdd2c71..0000000
--- a/target/linux/malta/base-files.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-define Package/base-files/install-target
-       rm -f $(1)/etc/config/network
-endef

diff --git a/target/linux/mediatek/base-files.mk b/target/linux/mediatek/base-files.mk
deleted file mode 100644 (file)
index fdd2c71..0000000
--- a/target/linux/mediatek/base-files.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-define Package/base-files/install-target
-       rm -f $(1)/etc/config/network
-endef

diff --git a/target/linux/mpc85xx/base-files.mk b/target/linux/mpc85xx/base-files.mk
deleted file mode 100644 (file)
index d6682bd..0000000
--- a/target/linux/mpc85xx/base-files.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-define Package/base-files/install-target
-       rm -f $(1)/etc/config/network
-endef
-
-

diff --git a/target/linux/mvebu/base-files.mk b/target/linux/mvebu/base-files.mk
deleted file mode 100644 (file)
index fdd2c71..0000000
--- a/target/linux/mvebu/base-files.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-define Package/base-files/install-target
-       rm -f $(1)/etc/config/network
-endef

diff --git a/target/linux/netlogic/base-files.mk b/target/linux/netlogic/base-files.mk
deleted file mode 100644 (file)
index d6682bd..0000000
--- a/target/linux/netlogic/base-files.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-define Package/base-files/install-target
-       rm -f $(1)/etc/config/network
-endef
-
-

diff --git a/target/linux/octeon/base-files.mk b/target/linux/octeon/base-files.mk
deleted file mode 100644 (file)
index fdd2c71..0000000
--- a/target/linux/octeon/base-files.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-define Package/base-files/install-target
-       rm -f $(1)/etc/config/network
-endef

diff --git a/target/linux/oxnas/base-files.mk b/target/linux/oxnas/base-files.mk
deleted file mode 100644 (file)
index fdd2c71..0000000
--- a/target/linux/oxnas/base-files.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-define Package/base-files/install-target
-       rm -f $(1)/etc/config/network
-endef

diff --git a/target/linux/ramips/base-files.mk b/target/linux/ramips/base-files.mk
deleted file mode 100644 (file)
index d6682bd..0000000
--- a/target/linux/ramips/base-files.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-define Package/base-files/install-target
-       rm -f $(1)/etc/config/network
-endef
-
-

diff --git a/target/linux/sunxi/base-files.mk b/target/linux/sunxi/base-files.mk
deleted file mode 100644 (file)
index fdd2c71..0000000
--- a/target/linux/sunxi/base-files.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-define Package/base-files/install-target
-       rm -f $(1)/etc/config/network
-endef