diff options
| author | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-05-10 16:29:15 +0000 |
|---|---|---|
| committer | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-05-10 16:29:15 +0000 |
| commit | 3c976d44328e065945d327ed87ad4b03dc1ff8f4 (patch) | |
| tree | 4af6e390b1ffb4cae9a33c1eac28bb23de317374 | |
| parent | 2a701a93d2b276c1e5e2f3710d449c55686f8034 (diff) | |
cleanup the broadcom preinit.arch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7176 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rwxr-xr-x | package/base-files/files/sbin/mount_root | 31 | ||||
| -rwxr-xr-x | target/linux/brcm-2.4/base-files/default/etc/preinit.arch | 28 |
2 files changed, 19 insertions, 40 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"') diff --git a/target/linux/brcm-2.4/base-files/default/etc/preinit.arch b/target/linux/brcm-2.4/base-files/default/etc/preinit.arch index d3a0bfc491..ec171c356e 100755 --- a/target/linux/brcm-2.4/base-files/default/etc/preinit.arch +++ b/target/linux/brcm-2.4/base-files/default/etc/preinit.arch @@ -26,30 +26,6 @@ failsafe() { mount none /proc -t proc -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 - mkdir /dev/shm - /sbin/hotplug2 --no-persistent --coldplug --set-rules-file /etc/hotplug2-init.rules - M0=/dev/ptmx - M1=/dev/ptmx - HOTPLUG= -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 trap 'FAILSAFE=true' USR1 @@ -81,7 +57,7 @@ insmod switch-robo || insmod switch-adm || rmmod switch-core }; done } || netmsg 192.168.1.255 "Press reset now, to enter Failsafe!" +ifconfig $ifname 0.0.0.0 down + sleep 2 -echo "$HOTPLUG" > /proc/sys/kernel/hotplug -ifconfig $ifname 0.0.0.0 down |