From 1ce8862ab409526a36936eb93db4e23ad92e3b79 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 3 Mar 2007 22:32:13 +0000 Subject: add failsafe support for x86-2.6 and fix mdev support for platforms using /etc/preinit git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6481 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/sbin/mount_root | 33 +++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) (limited to '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 607877c64..4fa048f43 100755 --- a/package/base-files/files/sbin/mount_root +++ b/package/base-files/files/sbin/mount_root @@ -5,17 +5,28 @@ mount none /proc -t proc size=$(awk '/Mem:/ {l=5242880;print((s=$2/2)/dev/null 2>/dev/null && { - mtd unlock rootfs - grep rootfs_data /proc/mtd >/dev/null 2>/dev/null && { - . /bin/firstboot - echo "switching to jffs2" - mount "$(find_mtd_part rootfs_data)" /jffs -t jffs2 - fopivot /jffs /rom - } -} || mount -o remount,rw /dev/root / - +if grep devfs /proc/filesystems > /dev/null; then + mount none /dev -t devfs +else + mount -t sysfs none /sys + mount -t tmpfs tmpfs /dev -o size=512K + mknod /dev/console c 5 1 + mkdir /dev/shm + /sbin/mdev -s +fi mkdir -p /dev/pts mount none /dev/pts -t devpts + +[ 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 + echo "switching to jffs2" + mount "$(find_mtd_part rootfs_data)" /jffs -t jffs2 + fopivot /jffs /rom + } + } || mount -o remount,rw /dev/root / +} + grep sysfs /proc/filesystems >/dev/null && mount -t sysfs none /sys 2>&- -- cgit v1.2.3