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 719dab75e151b05827ff123b891f0b8d4341ae8b..94ee18e5641d347e3c82ec9ff4492167b059a94b 100755 (executable)
--- 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 dbae25620b79c61dbde9ca96f84b4f32252f1134..b985948d78f1ba1372ca505fe3a900766b18f52a 100755 (executable)
--- 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 719dab75e151b05827ff123b891f0b8d4341ae8b..94ee18e5641d347e3c82ec9ff4492167b059a94b 100755 (executable)
--- 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