From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 1 Aug 2008 03:01:42 +0000 (+0000)
Subject: move the hotplug2 kill command from preinit to /etc/init.d/boot, so that it works... 
X-Git-Tag: v19.07.0-rc1~36581
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=37c7e13a5fb8a81f8765c2798aa5c193e8c1c3e1;p=openwrt%2Fstaging%2Fhauke.git

move the hotplug2 kill command from preinit to /etc/init.d/boot, so that it works for initramfs as well

SVN-Revision: 12058
---

diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot
index 57c034eb48..88dded646c 100755
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -48,6 +48,7 @@ start() {
 	ln -sf /tmp/resolv.conf.auto /tmp/resolv.conf
 	[ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
 
+	killall -q hotplug2
 	[ -x /sbin/hotplug2 ] && /sbin/hotplug2 --override --persistent \
 			--max-children 1 --no-coldplug &
 
diff --git a/package/base-files/files/etc/preinit b/package/base-files/files/etc/preinit
index 3b2ab74728..810558cf38 100755
--- a/package/base-files/files/etc/preinit
+++ b/package/base-files/files/etc/preinit
@@ -87,6 +87,5 @@ if [ -z "$INITRAMFS" ]; then
 
 	echo "- init -"
 	
-	killall hotplug2
 	exec /sbin/init
 fi