remove automounting script for block devices - it's causing more problems than it...

[openwrt.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 ffa6072..3ed1b58 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
 #!/bin/sh
 # Copyright (C) 2006 OpenWrt.org

+. /etc/functions.sh

 
 is_dirty() {
 
 is_dirty() {

+       mtdpart="$(find_mtd_part linux)"

        grep Broadcom /proc/cpuinfo >&- || return 1
        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 
 }
 
 if [ "$1" != "failsafe" ]; then 


@@ -17,7 +19,7 @@ if [ "$1" != "failsafe" ]; then
                is_dirty 
                [ $? != 0 ] && {
                        echo "switching to jffs2"
                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"
                        fopivot /jffs /rom
                } || {
                        echo "jffs2 not ready yet; using ramdisk"


@@ -25,7 +27,3 @@ if [ "$1" != "failsafe" ]; then
                }
        fi
 fi
                }
        fi
 fi

-
-mkdir -p /dev/pts
-mount none /dev/pts -t devpts 2>&-
-grep sysfs /proc/filesystems >/dev/null && mount -t sysfs none /sys 2>&-