summaryrefslogtreecommitdiffstats
path: root/openwrt/package/base-files/default/sbin/mount_root
diff options
context:
space:
mode:
Diffstat (limited to 'openwrt/package/base-files/default/sbin/mount_root')
-rwxr-xr-xopenwrt/package/base-files/default/sbin/mount_root14
1 files changed, 8 insertions, 6 deletions
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%