From: Mike Baker <mbm@openwrt.org>
Date: Sun, 17 Jul 2005 05:47:42 +0000 (+0200)
Subject: new variable "no_root_swap" to prevent squashfs from mounting jffs2
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=d01a429bc57baf19eb2c87e9ec6b5b3e95a5176b;p=openwrt%2Fsvn-archive%2Fopenwrt.git

new variable "no_root_swap" to prevent squashfs from mounting jffs2

SVN-Revision: 1480
---

diff --git a/openwrt/target/default/target_skeleton/sbin/mount_root b/openwrt/target/default/target_skeleton/sbin/mount_root
index eef55b4bdb..a551f2ef9c 100755
--- a/openwrt/target/default/target_skeleton/sbin/mount_root
+++ b/openwrt/target/default/target_skeleton/sbin/mount_root
@@ -12,12 +12,14 @@ if [ "$1" != "failsafe" ]; then
 			mount -o remount,rw /dev/root /
 		fi
 	else
-		mtd unlock OpenWrt
-		mount -t jffs2 /dev/mtdblock/4 /jffs
-		pivot_root /jffs /jffs/rom
-		mount none /proc -t proc
-		mount none /dev -t devfs
-		umount /rom/proc rom/dev >&-
+		if [ -z "$(nvram get no_root_swap)" ]; then
+			mtd unlock OpenWrt
+			mount -t jffs2 /dev/mtdblock/4 /jffs
+			pivot_root /jffs /jffs/rom
+			mount none /proc -t proc
+			mount none /dev -t devfs
+			umount /rom/proc rom/dev >&-
+		fi
 	fi
 fi
 mount none /tmp -t tmpfs size=50%