diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-03-03 19:22:41 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-03-03 19:22:41 +0000 |
| commit | 69aa065a6b80b4dc9df44a5f3d165e6f17269e81 (patch) | |
| tree | d836bfc95219af321b8550c907438f0b9ee4c61d | |
| parent | e5bb7fa66fa6549bbff34ed8cd5145b33c59fd46 (diff) | |
| download | master-187ad058-69aa065a6b80b4dc9df44a5f3d165e6f17269e81.tar.gz master-187ad058-69aa065a6b80b4dc9df44a5f3d165e6f17269e81.tar.bz2 master-187ad058-69aa065a6b80b4dc9df44a5f3d165e6f17269e81.zip | |
replace some hardcoded /dev/mtdblock/* references with calls to find_mtd_part()
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6477 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rwxr-xr-x | target/linux/brcm-2.4/base-files/default/sbin/mount_root | 8 |
1 files changed, 5 insertions, 3 deletions
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 ffa6072c66..8065470173 100755 --- 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" |