aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2008-08-01 03:01:42 +0000
committerFelix Fietkau <nbd@openwrt.org>2008-08-01 03:01:42 +0000
commit37c7e13a5fb8a81f8765c2798aa5c193e8c1c3e1 (patch)
tree3c0cf166a67d195c1a0974a7aab13e3f5d07a23d
parentd98002bd592032d86894ea2170ed11e269f95c95 (diff)
downloadupstream-37c7e13a5fb8a81f8765c2798aa5c193e8c1c3e1.tar.gz
upstream-37c7e13a5fb8a81f8765c2798aa5c193e8c1c3e1.tar.bz2
upstream-37c7e13a5fb8a81f8765c2798aa5c193e8c1c3e1.zip
move the hotplug2 kill command from preinit to /etc/init.d/boot, so that it works for initramfs as well
SVN-Revision: 12058
-rwxr-xr-xpackage/base-files/files/etc/init.d/boot1
-rwxr-xr-xpackage/base-files/files/etc/preinit1
2 files changed, 1 insertions, 1 deletions
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