install correct modules on 2.6 system, remove -EL from COPTS

[openwrt.git] / package / base-files / default / sbin / mount_root

diff --git a/package/base-files/default/sbin/mount_root b/package/base-files/default/sbin/mount_root
index b4ec2ca..29c5126 100755 (executable)
--- a/package/base-files/default/sbin/mount_root
+++ b/package/base-files/default/sbin/mount_root
@@ -12,12 +12,14 @@ if [ "$1" != "failsafe" ]; then
                        mount -o remount,rw /dev/root /
                fi
        else
                        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%
        fi
 fi
 mount none /tmp -t tmpfs -o nosuid,nodev,mode=1777,size=50%