add gcc 4.0.2, remove 4.0.0

[openwrt.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 29c5126..bc8d69c 100755 (executable)
--- a/openwrt/package/base-files/default/sbin/mount_root
+++ b/openwrt/package/base-files/default/sbin/mount_root
@@ -1,9 +1,10 @@
 #!/bin/sh
 #!/bin/sh

+. /etc/nvram.sh

 if [ "$1" != "failsafe" ]; then 
        mount | grep jffs2 >&-
        if [ $? = 0 ] ; then
                if [ $(cat /proc/mtd | wc -l) = 6 ]; then
 if [ "$1" != "failsafe" ]; then 
        mount | grep jffs2 >&-
        if [ $? = 0 ] ; then
                if [ $(cat /proc/mtd | wc -l) = 6 ]; then

-                       echo 5 > /proc/sys/diag
+                       [ -f /proc/sys/diag ] && echo 5 > /proc/sys/diag

                        mtd unlock linux
                        mtd erase OpenWrt
                        jffs2root --move
                        mtd unlock linux
                        mtd erase OpenWrt
                        jffs2root --move


@@ -12,7 +13,7 @@ if [ "$1" != "failsafe" ]; then
                        mount -o remount,rw /dev/root /
                fi
        else
                        mount -o remount,rw /dev/root /
                fi
        else

-               if [ -z "$(nvram get no_root_swap)" ]; then
+               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
                        mtd unlock OpenWrt
                        mount -t jffs2 /dev/mtdblock/4 /jffs
                        pivot_root /jffs /jffs/rom