summaryrefslogtreecommitdiff
path: root/package/base-files/files/etc
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-08-01 03:01:42 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-08-01 03:01:42 +0000
commit53f7e4a36b5e41a95f87d4a4a026e244b6087fa4 (patch)
tree4c66d77ba531feca2863b339c7cca691f71ac29a /package/base-files/files/etc
parent1f75fe411e6b949b0bc6c651aecd319ca110a468 (diff)
move the hotplug2 kill command from preinit to /etc/init.d/boot, so that it works for initramfs as well
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12058 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files/files/etc')
-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