From 18e309aa929423cace2216c5bcfa18fe4b15d7c2 Mon Sep 17 00:00:00 2001 From: mbm Date: Wed, 20 Jul 2005 19:58:40 +0000 Subject: updates from whiterussian git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1504 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- openwrt/package/base-files/default/sbin/mount_root | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to '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 b4ec2ca56..29c5126ba 100755 --- a/openwrt/package/base-files/default/sbin/mount_root +++ b/openwrt/package/base-files/default/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 -o nosuid,nodev,mode=1777,size=50% -- cgit v1.2.3