move the hotplug2 kill command from preinit to /etc/init.d/boot, so that it works...

[openwrt.git] / package / base-files / files / etc / preinit

diff --git a/package/base-files/files/etc/preinit b/package/base-files/files/etc/preinit
index 34befe5..810558c 100755 (executable)
--- a/package/base-files/files/etc/preinit
+++ b/package/base-files/files/etc/preinit
@@ -3,21 +3,89 @@
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 . /etc/diag.sh
 
+failsafe_ip() {
+       ifconfig $ifname 192.168.1.1 netmask 255.255.255.0 broadcast 192.168.1.255 up
+}
+
 failsafe() {
+       [ -n "$ifname" ] && grep "$ifname" /proc/net/dev >/dev/null && {
+               failsafe_ip
+               netmsg 192.168.1.255 "Entering Failsafe!"
+               telnetd -l /bin/login <> /dev/null 2>&1
+       }
        lock /tmp/.failsafe
        ash --login
 }
 
-[ -e /etc/preinit.arch ] && . /etc/preinit.arch
+mount proc /proc -t proc
+mount sysfs /sys -t sysfs
 
-mount -t proc none /proc
-mount -t sysfs none /sys
+size=$(awk '/MemTotal:/ {l=5242880;mt=($2*1024);print((s=mt/2)<l)?mt-l:s}' /proc/meminfo)
+mount tmpfs /tmp -t tmpfs -o size=$size,nosuid,nodev,mode=1777
 
-set_state preinit
+if grep devfs /proc/filesystems > /dev/null; then
+       mount devfs /dev -t devfs
+       M0=/dev/pty/m0
+       M1=/dev/pty/m1
+       HOTPLUG=/sbin/hotplug-call
+
+elif [ -x /sbin/hotplug2 ]; then
+       mount -t tmpfs tmpfs /dev -o size=512K
+       mknod /dev/console c 5 1
+       if [ -n "$INITRAMFS" ]; then
+               /sbin/hotplug2 --coldplug --no-persistent --max_children 1
+               /sbin/hotplug2 --persistent --max_children 1 &
+       else
+               /sbin/hotplug2 --coldplug --set-rules-file /etc/hotplug2-init.rules
+               /sbin/hotplug2 --no-coldplug --persistent --set-rules-file /etc/hotplug2-init.rules &
+       fi
+       M0=/dev/ptmx
+       M1=/dev/ptmx
+       HOTPLUG=
+
+elif [ -x /sbin/udevd ]; then
+       mount -n -t tmpfs -o mode=0755 udev /dev
+       /sbin/udevd --daemon
+       /sbin/udevtrigger
+       /sbin/udevsettle
+       M0=/dev/pty/ptmx
+       M1=/dev/pty/ptmx
+       HOTPLUG=
+fi
 
-mount_root ${FAILSAFE:+failsafe}
+mkdir -p /dev/pts /dev/shm
+mount devpts /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 && {
+       M0=/dev/console
+       M1=/dev/console
+}
+
+exec <$M0 >$M1 2>&0
+
+echo "- preinit -"
+trap 'FAILSAFE=true' USR1
+[ -e /etc/preinit.arch ] && . /etc/preinit.arch
+set_state preinit
+echo "$HOTPLUG" > /proc/sys/kernel/hotplug
 eval ${FAILSAFE:+failsafe}
 lock -w /tmp/.failsafe
 
-exec /sbin/init
+if [ -z "$INITRAMFS" ]; then
+       mount_root
+       [ -f /sysupgrade.tgz ] && {
+               echo "- config restore -"
+               cd /
+               mv sysupgrade.tgz /tmp
+               tar xzf /tmp/sysupgrade.tgz
+               rm -f /tmp/sysupgrade.tgz
+               sync
+       }
+
+       echo "- init -"
+       
+       exec /sbin/init
+fi