summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-03-03 19:22:41 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-03-03 19:22:41 +0000
commitc94c88df806f3438933a2cee3f93065f34a242f6 (patch)
treed836bfc95219af321b8550c907438f0b9ee4c61d
parentca96df4a862896effdfbc29cf9d159943c6e48ac (diff)
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-xtarget/linux/brcm-2.4/base-files/default/sbin/mount_root8
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 ffa6072c6..806547017 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"