X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/18e309aa929423cace2216c5bcfa18fe4b15d7c2..c69547006941e32e96ee33d2d051af46840889ae:/openwrt/package/base-files/default/sbin/mount_root

diff --git a/openwrt/package/base-files/default/sbin/mount_root b/openwrt/package/base-files/default/sbin/mount_root
index 29c5126ba..bc8d69c79 100755
--- a/openwrt/package/base-files/default/sbin/mount_root
+++ b/openwrt/package/base-files/default/sbin/mount_root
@@ -1,9 +1,10 @@
 #!/bin/sh
+. /etc/nvram.sh
 if [ "$1" != "failsafe" ]; then 
 	mount | grep jffs2 >&-
 	if [ $? = 0 ] ; then
 		if [ $(cat /proc/mtd | wc -l) = 6 ]; then
-			echo 5 > /proc/sys/diag
+			[ -f /proc/sys/diag ] && echo 5 > /proc/sys/diag
 			mtd unlock linux
 			mtd erase OpenWrt
 			jffs2root --move
@@ -12,7 +13,7 @@ if [ "$1" != "failsafe" ]; then
 			mount -o remount,rw /dev/root /
 		fi
 	else
-		if [ -z "$(nvram get no_root_swap)" ]; then
+		if [ \! -x /usr/sbin/nvram -o -z "$(nvram get no_root_swap)" ]; then
 			mtd unlock OpenWrt
 			mount -t jffs2 /dev/mtdblock/4 /jffs
 			pivot_root /jffs /jffs/rom