X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/4e1db00174445aef92431f33cad7e2ac40e73d11..cba027e9e27c2c70ed117265e177239007ad4683:/package/base-files/files/etc/preinit

diff --git a/package/base-files/files/etc/preinit b/package/base-files/files/etc/preinit
index 3b2ab7472..8c30fd8da 100755
--- a/package/base-files/files/etc/preinit
+++ b/package/base-files/files/etc/preinit
@@ -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,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
@@ -87,6 +84,5 @@ if [ -z "$INITRAMFS" ]; then
 
 	echo "- init -"
 	
-	killall hotplug2
 	exec /sbin/init
 fi