udhcpc: run dhcp hotplug events after dns has been set

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

diff --git a/package/base-files/files/etc/preinit b/package/base-files/files/etc/preinit
index 524b4252a2be19f82ead54f9442cd456a6bdb808..11b9100383f1248ac1ba47161d1a403518712484 100755 (executable)
--- 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
@@ -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