X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/de0bb1d6c480b2945cf25f80116d963b22dd3c7a..5cd6d51b7641a9ade3654ef425d3c796c537d27b:/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 a783f3d8f..835d60255 100755
--- a/package/base-files/files/sbin/mount_root
+++ b/package/base-files/files/sbin/mount_root
@@ -2,53 +2,24 @@
 # Copyright (C) 2006 OpenWrt.org
 . /etc/functions.sh
 
-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
-
-if grep devfs /proc/filesystems >/dev/null; then
-	mount none /dev -t devfs
-else
-	mount -t tmpfs tmpfs /dev -o size=512K
-	mknod /dev/console c 5 1
-	exec >/dev/console </dev/console 2>&1
-fi
-
-mkdir /dev/shm
-
-if grep sysfs /proc/filesystems >/dev/null; then
-	mount -t sysfs none /sys
-	HOTPLUG=""
-	# use a minimal ruleset only for creating device nodes
-	/sbin/hotplug2 --no-persistent --coldplug --set-rules-file /etc/hotplug2-init.rules
-else
-	HOTPLUG="/sbin/hotplug2-dnode"
-fi
-echo "$HOTPLUG" > /proc/sys/kernel/hotplug
-
-mkdir -p /dev/pts
-mount none /dev/pts -t devpts
-
 jffs2_ready () {
 	mtdpart="$(find_mtd_part rootfs_data)"
 	magic=$(hexdump $mtdpart -n 4 -e '4/1 "%02x"')
 	[ "$magic" != "deadc0de" ]
 }
 
-[ 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
-				fopivot /jffs /rom
-			} || {
-				echo "jffs2 not ready yet; using ramdisk"
-				ramoverlay
-			}
-		}
-	} || mount -o remount,rw /dev/root /
+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
+	} || {
+		echo "jffs2 not ready yet; using ramdisk"
+		ramoverlay
+	}
+} || {
+	mtd unlock rootfs
+	mount -o remount,rw /dev/root /
 }