X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/efbc756b232a92ad8176ed8cc3d37846939c8245..3692c8f246d2c2e5b5e203d791c6a4ac07593d9f:/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 bc8d69c79..81660f006 100755 --- a/package/base-files/default/sbin/mount_root +++ b/package/base-files/default/sbin/mount_root @@ -1,28 +1,10 @@ #!/bin/sh -. /etc/nvram.sh -if [ "$1" != "failsafe" ]; then - mount | grep jffs2 >&- - if [ $? = 0 ] ; then - if [ $(cat /proc/mtd | wc -l) = 6 ]; then - [ -f /proc/sys/diag ] && echo 5 > /proc/sys/diag - mtd unlock linux - mtd erase OpenWrt - jffs2root --move - else - mtd unlock rootfs - mount -o remount,rw /dev/root / - fi - else - if [ \! -x /usr/sbin/nvram -o -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% +# Copyright (C) 2006 OpenWrt.org + +mount none /proc -t proc +size=$(awk '/Mem:/ {l=5242880;print((s=$2/2)&- +mount -o remount,rw /dev/root /