large init script cleanup and merge of whiterussian changes, new dnsmasq config handling

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

diff --git a/openwrt/package/base-files/default/sbin/mount_root b/openwrt/package/base-files/default/sbin/mount_root
index 427ff0444ff06c3959d61dc6def73734213404d4..38252e83fe578635c35f8b115d4dbbfdf5de6332 100755 (executable)
--- a/openwrt/package/base-files/default/sbin/mount_root
+++ b/openwrt/package/base-files/default/sbin/mount_root
@@ -1,40 +1,34 @@
 #!/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
+is_dirty() {
+       grep Broadcom /proc/cpuinfo >&- || return 1
+       OFFSET="$(($(hexdump -v /dev/mtdblock/1 -s 20 -n 2 -e '"%d"')-1))"
+       return $(hexdump -v /dev/mtdblock/1 -s $OFFSET -n 1 -e '"%d"')
 }
 
+size=$(awk '/Mem:/ {l=5242880;print((s=$2/2)<l)?$2-l:s}' /proc/meminfo)
+mount none /tmp -t tmpfs -o size=$size
+
 if [ "$1" != "failsafe" ]; then 
+       mtd unlock linux
        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
+               . /bin/firstboot
+               is_dirty 
+               [ $? != 0 ] && {
+                       mount /dev/mtdblock/4 /jffs
+                       pivot /jffs /rom
+               } || ramoverlay
        fi
 fi
-mount none /tmp -t tmpfs -o nosuid,nodev,mode=1777,size=50%
+
+mount none /tmp -t tmpfs -o remount,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>&-