diff options
| author | Mike Baker <mbm@openwrt.org> | 2005-07-20 19:58:40 +0000 |
|---|---|---|
| committer | Mike Baker <mbm@openwrt.org> | 2005-07-20 19:58:40 +0000 |
| commit | 6a4f0e2b5488b191d8d96482717f56984bc2e386 (patch) | |
| tree | c955985cd7d6588cb3e96865f49181f809cf2b85 /openwrt/package/base-files/default/sbin/mount_root | |
| parent | 5ea9dc5f57a7c9fe3fd6fc891a3e3409986da2de (diff) | |
| download | mtk-20170518-6a4f0e2b5488b191d8d96482717f56984bc2e386.zip mtk-20170518-6a4f0e2b5488b191d8d96482717f56984bc2e386.tar.gz mtk-20170518-6a4f0e2b5488b191d8d96482717f56984bc2e386.tar.bz2 | |
updates from whiterussian
SVN-Revision: 1504
Diffstat (limited to 'openwrt/package/base-files/default/sbin/mount_root')
| -rwxr-xr-x | openwrt/package/base-files/default/sbin/mount_root | 14 |
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 b4ec2ca..29c5126 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% |