X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/1ebe6d34880d1e26b37fe4f794b5039a8245e750..8785e41158918c4bd966e7f43947865e462cabf7:/package/base-files/files/sbin/mount_root?ds=sidebyside

diff --git a/package/base-files/files/sbin/mount_root b/package/base-files/files/sbin/mount_root
index 607877c64..835d60255 100755
--- a/package/base-files/files/sbin/mount_root
+++ b/package/base-files/files/sbin/mount_root
@@ -2,20 +2,24 @@
 # Copyright (C) 2006 OpenWrt.org
 . /etc/functions.sh
 
-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
+jffs2_ready () {
+	mtdpart="$(find_mtd_part rootfs_data)"
+	magic=$(hexdump $mtdpart -n 4 -e '4/1 "%02x"')
+	[ "$magic" != "deadc0de" ]
+}
 
-grep rootfs /proc/mtd >/dev/null 2>/dev/null && {
-	mtd unlock rootfs
-	grep rootfs_data /proc/mtd >/dev/null 2>/dev/null && {
-		. /bin/firstboot
+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
+		mount "$(find_mtd_part rootfs_data)" /jffs -t jffs2 && \
+			fopivot /jffs /rom
+	} || {
+		echo "jffs2 not ready yet; using ramdisk"
+		ramoverlay
 	}
-} || mount -o remount,rw /dev/root /
-
-mkdir -p /dev/pts
-mount none /dev/pts -t devpts
-grep sysfs /proc/filesystems >/dev/null && mount -t sysfs none /sys 2>&-
+} || {
+	mtd unlock rootfs
+	mount -o remount,rw /dev/root /
+}