X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/263af2cd582c91c6d80c1a1820baef0d2c2fc1bd..3099fb8fb3408f20e009e8b26b8426cc31da675d:/package/base-files/files/etc/preinit

diff --git a/package/base-files/files/etc/preinit b/package/base-files/files/etc/preinit
index ddbb2f33b..11b910038 100755
--- a/package/base-files/files/etc/preinit
+++ b/package/base-files/files/etc/preinit
@@ -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
@@ -29,7 +29,7 @@ if grep devfs /proc/filesystems > /dev/null; then
 	M1=/dev/pty/m1
 	HOTPLUG=/sbin/hotplug-call
 
-elif [ -x /sbin/hotplug ]; then
+elif [ -x /sbin/hotplug2 ]; then
 	mount -t tmpfs tmpfs /dev -o size=512K
 	mknod /dev/console c 5 1
 	/sbin/hotplug2 --coldplug --set-rules-file /etc/hotplug2-init.rules
@@ -62,6 +62,8 @@ 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
@@ -82,6 +84,5 @@ if [ -z "$INITRAMFS" ]; then
 
 	echo "- init -"
 	
-	killall hotplug2
 	exec /sbin/init
 fi