make sure that /etc/rc.d exists before creating symlinks

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

diff --git a/package/base-files/files/sbin/mount_root b/package/base-files/files/sbin/mount_root
index f1d93ba..eac4ef3 100755 (executable)
--- a/package/base-files/files/sbin/mount_root
+++ b/package/base-files/files/sbin/mount_root
@@ -2,10 +2,6 @@
 # Copyright (C) 2006 OpenWrt.org
 . /etc/functions.sh
 
 # Copyright (C) 2006 OpenWrt.org
 . /etc/functions.sh
 

-mkdir -p /dev/pts /dev/shm
-mount none /dev/pts -t devpts
-mount none /proc -t proc
-

 size=$(awk '/MemTotal:/ {l=5242880;mt=($2*1024);print((s=mt/2)<l)?mt-l:s}' /proc/meminfo)
 mount none /tmp -t tmpfs -o size=$size,nosuid,nodev,mode=1777
 
 size=$(awk '/MemTotal:/ {l=5242880;mt=($2*1024);print((s=mt/2)<l)?mt-l:s}' /proc/meminfo)
 mount none /tmp -t tmpfs -o size=$size,nosuid,nodev,mode=1777
 


@@ -15,7 +11,6 @@ if grep devfs /proc/filesystems > /dev/null; then
        M1=/dev/pty/m1
        HOTPLUG=/sbin/hotplug-call
 else
        M1=/dev/pty/m1
        HOTPLUG=/sbin/hotplug-call
 else

-       mount -t sysfs none /sys

        mount -t tmpfs tmpfs /dev -o size=512K
        mknod /dev/console c 5 1
        mkdir /dev/shm
        mount -t tmpfs tmpfs /dev -o size=512K
        mknod /dev/console c 5 1
        mkdir /dev/shm


@@ -25,6 +20,9 @@ else
        HOTPLUG=
 fi
 
        HOTPLUG=
 fi
 

+mkdir -p /dev/pts /dev/shm
+mount none /dev/pts -t devpts
+

 # the shell really doesn't like having stdin/out closed
 # that's why we use /dev/pty/m0 and m1 as replacement
 # for /dev/console if there's no serial console available
 # the shell really doesn't like having stdin/out closed
 # that's why we use /dev/pty/m0 and m1 as replacement
 # for /dev/console if there's no serial console available


@@ -40,18 +38,19 @@ jffs2_ready () {
 }
 
 [ failsafe != "$1" ] && {
 }
 
 [ failsafe != "$1" ] && {

-       grep rootfs /proc/mtd >/dev/null 2>/dev/null && {
-               mtd unlock rootfs
-               grep rootfs_data /proc/mtd >/dev/null 2>/dev/null && {
-                       . /bin/firstboot
-                       jffs2_ready && {
-                               echo "switching to jffs2"
-                               mount "$(find_mtd_part rootfs_data)" /jffs -t jffs2
+       grep rootfs_data /proc/mtd >/dev/null 2>/dev/null && {
+               . /bin/firstboot
+               mtd unlock rootfs_data
+               jffs2_ready && {
+                       echo "switching to jffs2"
+                       mount "$(find_mtd_part rootfs_data)" /jffs -t jffs2 && \

                                fopivot /jffs /rom
                                fopivot /jffs /rom

-                       } || {
-                               echo "jffs2 not ready yet; using ramdisk"
-                               ramoverlay
-                       }
+               } || {
+                       echo "jffs2 not ready yet; using ramdisk"
+                       ramoverlay

                }
                }

-       } || mount -o remount,rw /dev/root /
+       } || {
+               mtd unlock rootfs
+               mount -o remount,rw /dev/root /
+       }

 }
 }