more hotplug2/mdev/devfs related fixups, this time for broadcom

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6519 3c298f89-4303-0410-b956-a3cf2f4a3e73

2 files changed, 21 insertions, 14 deletions

diff --git a/target/linux/brcm-2.4/base-files/default/etc/preinit b/target/linux/brcm-2.4/base-files/default/etc/preinit
index b7a9f0477..312cac507 100755
--- a/target/linux/brcm-2.4/base-files/default/etc/preinit
+++ b/target/linux/brcm-2.4/base-files/default/etc/preinit
@@ -27,6 +27,27 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 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
+if grep devfs /proc/filesystems > /dev/null; then
+	mount none /dev -t devfs
+	M0=/dev/pty/m0
+	M1=/dev/pty/m1
+else
+	mount -t sysfs none /sys
+	mount -t tmpfs tmpfs /dev -o size=512K
+	mknod /dev/console c 5 1
+	mkdir /dev/shm
+	/sbin/hotplug2 --no-persistent --coldplug
+	M0=/dev/ptmx
+	M1=/dev/ptmx
+fi
+mkdir -p /dev/pts
+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
+dd if=/dev/console of=/dev/null bs=1 count=0 >/dev/null 2>/dev/null || \
+	exec <$M0 >$M1 2>&0
 
 insmod diag
 set_state preinit
diff --git a/target/linux/brcm-2.4/base-files/default/sbin/mount_root b/target/linux/brcm-2.4/base-files/default/sbin/mount_root
index bd0d56153..3ed1b5861 100755
--- a/target/linux/brcm-2.4/base-files/default/sbin/mount_root
+++ b/target/linux/brcm-2.4/base-files/default/sbin/mount_root
@@ -9,18 +9,6 @@ is_dirty() {
 	return $(hexdump -v $mtdpart -s $OFFSET -n 1 -e '"%d"')
 }
 
-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
-
 if [ "$1" != "failsafe" ]; then 
 	mtd unlock linux
 	mount | grep jffs2 >&-
@@ -39,5 +27,3 @@ if [ "$1" != "failsafe" ]; then
 		}
 	fi
 fi
-
-grep sysfs /proc/filesystems >/dev/null && mount -t sysfs none /sys 2>&-