From: Andy Boyett <agb@openwrt.org>
Date: Thu, 26 Feb 2009 05:54:07 +0000 (+0000)
Subject: defconfig: move defaults from /etc/config/defaults/ to /etc/defconfig/, previous... 
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fdedeckeh.git;a=commitdiff_plain;h=f88c482dea8f958da8a1599b90b1380cecff107e

defconfig: move defaults from /etc/config/defaults/ to /etc/defconfig/, previous location broke uci

SVN-Revision: 14662
---

diff --git a/target/linux/ar71xx/base-files/etc/config/defaults/generic/network b/target/linux/ar71xx/base-files/etc/config/defaults/generic/network
deleted file mode 100644
index 2d4d8e0121..0000000000
--- a/target/linux/ar71xx/base-files/etc/config/defaults/generic/network
+++ /dev/null
@@ -1,16 +0,0 @@
-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
-
-config interface wan
-	option ifname	eth1
-	option proto	dhcp
diff --git a/target/linux/ar71xx/base-files/etc/config/defaults/mzk-w04nu/network b/target/linux/ar71xx/base-files/etc/config/defaults/mzk-w04nu/network
deleted file mode 100644
index 2d4d8e0121..0000000000
--- a/target/linux/ar71xx/base-files/etc/config/defaults/mzk-w04nu/network
+++ /dev/null
@@ -1,16 +0,0 @@
-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
-
-config interface wan
-	option ifname	eth1
-	option proto	dhcp
diff --git a/target/linux/ar71xx/base-files/etc/config/defaults/tl-wr941nd/network b/target/linux/ar71xx/base-files/etc/config/defaults/tl-wr941nd/network
deleted file mode 100644
index 65f6c3fc67..0000000000
--- a/target/linux/ar71xx/base-files/etc/config/defaults/tl-wr941nd/network
+++ /dev/null
@@ -1,19 +0,0 @@
-config interface loopback
-	option ifname	lo
-	option proto	static
-	option ipaddr	127.0.0.1
-	option netmask	255.0.0.0
-
-config interface eth
-	option ifname	eth0
-
-config interface lan
-	option ifname	"lan1 lan2 lan3 lan4"
-	option type	bridge
-	option proto	static
-	option ipaddr	192.168.1.1
-	option netmask	255.255.255.0
-
-config interface wan
-	option ifname	wan
-	option proto	dhcp
diff --git a/target/linux/ar71xx/base-files/etc/defconfig/generic/network b/target/linux/ar71xx/base-files/etc/defconfig/generic/network
new file mode 100644
index 0000000000..2d4d8e0121
--- /dev/null
+++ b/target/linux/ar71xx/base-files/etc/defconfig/generic/network
@@ -0,0 +1,16 @@
+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
+
+config interface wan
+	option ifname	eth1
+	option proto	dhcp
diff --git a/target/linux/ar71xx/base-files/etc/defconfig/mzk-w04nu/network b/target/linux/ar71xx/base-files/etc/defconfig/mzk-w04nu/network
new file mode 100644
index 0000000000..2d4d8e0121
--- /dev/null
+++ b/target/linux/ar71xx/base-files/etc/defconfig/mzk-w04nu/network
@@ -0,0 +1,16 @@
+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
+
+config interface wan
+	option ifname	eth1
+	option proto	dhcp
diff --git a/target/linux/ar71xx/base-files/etc/defconfig/tl-wr941nd/network b/target/linux/ar71xx/base-files/etc/defconfig/tl-wr941nd/network
new file mode 100644
index 0000000000..65f6c3fc67
--- /dev/null
+++ b/target/linux/ar71xx/base-files/etc/defconfig/tl-wr941nd/network
@@ -0,0 +1,19 @@
+config interface loopback
+	option ifname	lo
+	option proto	static
+	option ipaddr	127.0.0.1
+	option netmask	255.0.0.0
+
+config interface eth
+	option ifname	eth0
+
+config interface lan
+	option ifname	"lan1 lan2 lan3 lan4"
+	option type	bridge
+	option proto	static
+	option ipaddr	192.168.1.1
+	option netmask	255.255.255.0
+
+config interface wan
+	option ifname	wan
+	option proto	dhcp
diff --git a/target/linux/ar71xx/base-files/etc/init.d/defconfig b/target/linux/ar71xx/base-files/etc/init.d/defconfig
index f65d559fe8..856d375829 100755
--- a/target/linux/ar71xx/base-files/etc/init.d/defconfig
+++ b/target/linux/ar71xx/base-files/etc/init.d/defconfig
@@ -10,11 +10,11 @@ START=05
 start() {
 	local board=$(ar71xx_board_name)
 
-	[ ! -d /etc/config/defaults/$board ] && board="generic"
+	[ ! -d /etc/defconfig/$board ] && board="generic"
 
-	for f in $( ls /etc/config/defaults/$board ); do
+	for f in $( ls /etc/defconfig/$board ); do
 		if [ ! -e /etc/config/$f ]; then
-			cp /etc/config/defaults/$board/$f /etc/config/
+			cp /etc/defconfig/$board/$f /etc/config/
 		fi
 	done
 }