aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorMike Baker <mbm@openwrt.org>2007-05-10 16:29:15 +0000
committerMike Baker <mbm@openwrt.org>2007-05-10 16:29:15 +0000
commit46201c4ab440c86252723c4a837b721f8e031cda (patch)
tree4af6e390b1ffb4cae9a33c1eac28bb23de317374 /package
parenta354075669483848418ed0019ac30d65c2ae097b (diff)
downloadupstream-46201c4ab440c86252723c4a837b721f8e031cda.tar.gz
upstream-46201c4ab440c86252723c4a837b721f8e031cda.tar.bz2
upstream-46201c4ab440c86252723c4a837b721f8e031cda.zip
cleanup the broadcom preinit.arch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7176 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rwxr-xr-xpackage/base-files/files/sbin/mount_root31
1 files changed, 17 insertions, 14 deletions
diff --git a/package/base-files/files/sbin/mount_root b/package/base-files/files/sbin/mount_root
index a783f3d8ff..f1d93bafc3 100755
--- a/package/base-files/files/sbin/mount_root
+++ b/package/base-files/files/sbin/mount_root
@@ -2,34 +2,37 @@
# 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
-if grep devfs /proc/filesystems >/dev/null; then
+if grep devfs /proc/filesystems > /dev/null; then
mount none /dev -t devfs
+ M0=/dev/pty/m0
+ 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
- exec >/dev/console </dev/console 2>&1
+ mkdir /dev/shm
+ /sbin/hotplug2 --no-persistent --coldplug --set-rules-file /etc/hotplug2-init.rules
+ M0=/dev/ptmx
+ M1=/dev/ptmx
+ HOTPLUG=
fi
-mkdir /dev/shm
+# 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
-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"')