From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 31 Jan 2006 22:36:07 +0000 (+0000)
Subject: finally fix the /etc/config/network bug on wgt634u (#214, #215, #219)
X-Git-Tag: reboot~31161
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f7ba30f01a2e2c500c8818feabb1b33e9442d077;p=openwrt%2Fopenwrt.git

finally fix the /etc/config/network bug on wgt634u (#214, #215, #219)

SVN-Revision: 3105
---

diff --git a/openwrt/target/linux/package/base-files/files/brcm-2.4/etc/init.d/S05netconfig b/openwrt/target/linux/package/base-files/files/brcm-2.4/etc/init.d/S05netconfig
index 719dab75e1..94ee18e564 100755
--- a/openwrt/target/linux/package/base-files/files/brcm-2.4/etc/init.d/S05netconfig
+++ b/openwrt/target/linux/package/base-files/files/brcm-2.4/etc/init.d/S05netconfig
@@ -4,7 +4,7 @@
 mkdir -p /etc/config
 
 (
-	if [ "$(/usr/bin/head -c4 /dev/mtdblock/1 | /usr/bin/tail -c3)" = "ELF" ]; then
+	if grep 'mtd0: 00060000' /proc/mtd 2>&- >&-; then
 		# WGT634u
 		echo boardtype=wgt634u
 	else
diff --git a/openwrt/target/linux/package/base-files/files/brcm-2.4/etc/init.d/S05nvram b/openwrt/target/linux/package/base-files/files/brcm-2.4/etc/init.d/S05nvram
index dbae25620b..b985948d78 100755
--- a/openwrt/target/linux/package/base-files/files/brcm-2.4/etc/init.d/S05nvram
+++ b/openwrt/target/linux/package/base-files/files/brcm-2.4/etc/init.d/S05nvram
@@ -7,7 +7,7 @@
 alias debug=${DEBUG:-:}
 
 # WGT634u
-[ "$(/usr/bin/head -c4 /dev/mtdblock/1 | /usr/bin/tail -c3)" = "ELF" ] && exit
+grep 'mtd0: 00060000' /proc/mtd 2>&- >&- && exit
 
 remap () {
 	for type in lan wifi wan pppoe
diff --git a/openwrt/target/linux/package/base-files/files/brcm-2.6/etc/init.d/S05netconfig b/openwrt/target/linux/package/base-files/files/brcm-2.6/etc/init.d/S05netconfig
index 719dab75e1..94ee18e564 100755
--- a/openwrt/target/linux/package/base-files/files/brcm-2.6/etc/init.d/S05netconfig
+++ b/openwrt/target/linux/package/base-files/files/brcm-2.6/etc/init.d/S05netconfig
@@ -4,7 +4,7 @@
 mkdir -p /etc/config
 
 (
-	if [ "$(/usr/bin/head -c4 /dev/mtdblock/1 | /usr/bin/tail -c3)" = "ELF" ]; then
+	if grep 'mtd0: 00060000' /proc/mtd 2>&- >&-; then
 		# WGT634u
 		echo boardtype=wgt634u
 	else