From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 3 Mar 2007 19:22:41 +0000 (+0000)
Subject: replace some hardcoded /dev/mtdblock/* references with calls to find_mtd_part()
X-Git-Tag: kamikaze_7.06~573
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7b0de4ae45abb18db2093cd8ebc9dd6415fc361a;p=openwrt%2Fsvn-archive%2Fopenwrt.git

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

SVN-Revision: 6477
---

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"