X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/cad490a0db13c37f43e753db9c2228eac2cfe98f..ed5ef674d100ca0ffa8bc00160718f69af5515c3:/package/base-files/default/sbin/mount_root?ds=inline

diff --git a/package/base-files/default/sbin/mount_root b/package/base-files/default/sbin/mount_root
index 427ff0444..81660f006 100755
--- a/package/base-files/default/sbin/mount_root
+++ b/package/base-files/default/sbin/mount_root
@@ -1,40 +1,10 @@
 #!/bin/sh
-. /etc/nvram.sh
-is_clean() {
-	grep Broadcom /proc/cpuinfo 2>&- >&- || return 0
-	OFFSET="$((0x$(dd if=/dev/mtdblock/1 bs=1 skip=$((0x14)) count=2 2>&- | hexdump | grep 0000000 | cut -d ' ' -f 2) - 1))"
-	dd if=/dev/mtdblock/1 bs=1 skip=$OFFSET count=1 2>&- | hexdump -v | grep ' 0000' > /dev/null && return 255 || return 0
-}
+# Copyright (C) 2006 OpenWrt.org
 
-if [ "$1" != "failsafe" ]; then 
-	mount | grep jffs2 >&-
-	if [ $? = 0 ] ; then
-		if [ $(cat /proc/mtd | wc -l) = 6 ]; then
-			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 [ -z "$(nvram get no_root_swap)" ]; then
-			is_clean || {
-				mtd erase OpenWrt
-				mtd unlock linux
-				jffs2root --clean
-			}
-			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%
+mount none /proc -t proc
+size=$(awk '/Mem:/ {l=5242880;print((s=$2/2)<l)?$2-l:s}' /proc/meminfo)
+mount none /tmp -t tmpfs -o size=$size,nosuid,nodev,mode=1777
 mkdir -p /dev/pts
 mount none /dev/pts -t devpts
-grep sysfs /proc/filesystems >&- && mount -t sysfs none /sys
+mount -t sysfs none /sys 2>&-
+mount -o remount,rw /dev/root /