replace some hardcoded /dev/mtdblock/* references with calls to find_mtd_part()

[openwrt-10.03/.git] / target / linux / brcm-2.4 / base-files / default / sbin / mount_root

diff --git a/target/linux/brcm-2.4/base-files/default/sbin/mount_root b/target/linux/brcm-2.4/base-files/default/sbin/mount_root
index ffa6072c66776ebb6f8829d5e8404d913dc10056..8065470173b79a8c96aa0089072abd92ce9a5ebd 100755 (executable)
--- a/target/linux/brcm-2.4/base-files/default/sbin/mount_root
+++ b/target/linux/brcm-2.4/base-files/default/sbin/mount_root
@@ -1,10 +1,12 @@
 #!/bin/sh
 # Copyright (C) 2006 OpenWrt.org
+. /etc/functions.sh
 
 is_dirty() {
+       mtdpart="$(find_mtd_part linux)"
        grep Broadcom /proc/cpuinfo >&- || return 1
-       OFFSET="$(($(hexdump -v /dev/mtdblock/1 -s 20 -n 2 -e '"%d"')-1))"
-       return $(hexdump -v /dev/mtdblock/1 -s $OFFSET -n 1 -e '"%d"')
+       OFFSET="$(($(hexdump -v $mtdpart -s 20 -n 2 -e '"%d"')-1))"
+       return $(hexdump -v $mtdpart -s $OFFSET -n 1 -e '"%d"')
 }
 
 if [ "$1" != "failsafe" ]; then 
@@ -17,7 +19,7 @@ if [ "$1" != "failsafe" ]; then
                is_dirty 
                [ $? != 0 ] && {
                        echo "switching to jffs2"
-                       mount /dev/mtdblock/4 /jffs -t jffs2
+                       mount $(find_mtd_part OpenWrt) /jffs -t jffs2
                        fopivot /jffs /rom
                } || {
                        echo "jffs2 not ready yet; using ramdisk"