X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/53f7e4a36b5e41a95f87d4a4a026e244b6087fa4..a4bdef9ca9051d829ee12f9f8ae36016f0c2136e:/package/base-files/files/etc/preinit?ds=sidebyside diff --git a/package/base-files/files/etc/preinit b/package/base-files/files/etc/preinit index 810558cf3..76443836e 100755 --- a/package/base-files/files/etc/preinit +++ b/package/base-files/files/etc/preinit @@ -11,7 +11,7 @@ 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 + telnetd -l /bin/login.sh <> /dev/null 2>&1 } lock /tmp/.failsafe ash --login @@ -20,7 +20,7 @@ failsafe() { mount proc /proc -t proc mount sysfs /sys -t sysfs -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 if grep devfs /proc/filesystems > /dev/null; then @@ -32,13 +32,8 @@ if grep devfs /proc/filesystems > /dev/null; then 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 + /sbin/hotplug2 --coldplug --set-rules-file /etc/hotplug2-init.rules + /sbin/hotplug2 --no-coldplug --persistent --set-rules-file /etc/hotplug2-init.rules & M0=/dev/ptmx M1=/dev/ptmx HOTPLUG= @@ -67,10 +62,13 @@ dd if=/dev/console of=/dev/null bs=1 count=0 >/dev/null 2>/dev/null && { exec <$M0 >$M1 2>&0 echo "- preinit -" +echo "Press CTRL-C for failsafe" +trap 'FAILSAFE=true' INT trap 'FAILSAFE=true' USR1 [ -e /etc/preinit.arch ] && . /etc/preinit.arch set_state preinit echo "$HOTPLUG" > /proc/sys/kernel/hotplug +export FAILSAFE eval ${FAILSAFE:+failsafe} lock -w /tmp/.failsafe