X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/8ed5dc94457a101aa9a79fae3f2a28ff043ff08b..a4bdef9ca9051d829ee12f9f8ae36016f0c2136e:/package/base-files/files/etc/preinit

diff --git a/package/base-files/files/etc/preinit b/package/base-files/files/etc/preinit
index 24c2b6d28..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)
+size=$(awk '/MemTotal:/ {l=5242880;mt=($2*1024);print((s=mt/2)<l)&&(mt>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
@@ -62,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