add firmware loading support to hotplug

[openwrt-10.03/.git] / package / base-files / default / sbin / mount_root

diff --git a/package/base-files/default/sbin/mount_root b/package/base-files/default/sbin/mount_root
index c8edaaa2fa1e913812b9fcc30a07c85473257dbd..e855b41a1e8c02ef5162b03f46c539edf977e872 100755 (executable)
--- a/package/base-files/default/sbin/mount_root
+++ b/package/base-files/default/sbin/mount_root
@@ -1,6 +1,7 @@
 #!/bin/sh
 . /etc/nvram.sh
 is_clean() {
+       grep Broadcom /proc/cpuinfo 2>&- >&- || return 0
        OFFSET="$((0x$(dd if=/dev/mtdblock/1 bs=1 skip=$((0x14)) count=2 2>&- | hexdump | grep 0000000 | cut -d ' ' -f 2) - 1))"
        dd if=/dev/mtdblock/1 bs=1 skip=$OFFSET count=1 2>&- | hexdump -v | grep ' 0000' > /dev/null && return 255 || return 0
 }
@@ -21,6 +22,7 @@ if [ "$1" != "failsafe" ]; then
                if [ -z "$(nvram get no_root_swap)" ]; then
                        is_clean || {
                                mtd erase OpenWrt
+                               mtd unlock linux
                                jffs2root --clean
                        }
                        mtd unlock OpenWrt