fix a race condition which would leave dnsmasq in infinite resolving recursion nirvana

[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 c24035e..11b9100 100755 (executable)
--- a/package/base-files/files/etc/preinit
+++ b/package/base-files/files/etc/preinit
@@ -18,9 +18,9 @@ failsafe() {
 }
 
 mount proc /proc -t proc
-mount sysfs /sys  -t sysfs
+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
@@ -28,15 +28,24 @@ if grep devfs /proc/filesystems > /dev/null; then
        M0=/dev/pty/m0
        M1=/dev/pty/m1
        HOTPLUG=/sbin/hotplug-call
-else
+
+elif [ -x /sbin/hotplug2 ]; then
        mount -t tmpfs tmpfs /dev -o size=512K
        mknod /dev/console c 5 1
-       mkdir /dev/shm
        /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=
+
+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
 
 mkdir -p /dev/pts /dev/shm
@@ -53,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
@@ -73,6 +84,5 @@ if [ -z "$INITRAMFS" ]; then
 
        echo "- init -"
        
-       killall hotplug2
        exec /sbin/init
 fi