port the changes from [3155] to Kamikaze

[openwrt.git] / openwrt / target / linux / package / base-files / files / brcm-2.4 / etc / init.d / S05nvram

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 a561b39..b985948 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
@@ -33,7 +33,7 @@ nvram_set() { # for the linksys fixup part
 # work around braindead CFE defaults in linksys routers
 boardtype=$(nvram get boardtype)
 boardflags=$(($(nvram get boardflags)))
-[ "$boardtype" = "bcm4710dev" ] && boardtype="0xdeadbeef"
+[ "$boardtype" = "bcm94710dev" ] && boardtype="0xdeadbeef"
 adm_switch="$(( ($boardflags & 0x80) >> 7 ))"
 case "$(( $boardtype ))" in
        "$((0x708))")