aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-05-28 18:48:54 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-05-28 18:48:54 +0000
commit463a6f4bda3a01c3c699771661f3007541a7fd68 (patch)
treea87e8a7210c3a3c14414285c7283a54ad47d48de
parent61f503c77ac7ce958ca951707a69d7a9d9327599 (diff)
downloadupstream-463a6f4bda3a01c3c699771661f3007541a7fd68.tar.gz
upstream-463a6f4bda3a01c3c699771661f3007541a7fd68.tar.bz2
upstream-463a6f4bda3a01c3c699771661f3007541a7fd68.zip
base-files: update command line for the new hotplug2
SVN-Revision: 16154
-rw-r--r--package/base-files/Makefile2
-rwxr-xr-xpackage/base-files/files/etc/init.d/boot3
-rwxr-xr-xpackage/base-files/files/etc/preinit4
3 files changed, 5 insertions, 4 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 6a697f153c..3bb809f43c 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=base-files
-PKG_RELEASE:=20
+PKG_RELEASE:=21
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot
index 12226be788..6ecddfb022 100755
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -52,7 +52,8 @@ start() {
killall -q hotplug2
[ -x /sbin/hotplug2 ] && /sbin/hotplug2 --override --persistent \
- --max-children 1 --no-coldplug >/dev/null 2>&1 &
+ --set-worker /lib/hotplug2/worker_fork.so \
+ --max-children 1 >/dev/null 2>&1 &
# the coldplugging of network interfaces needs to happen later, so we do it manually here
for iface in $(awk -F: '/:/ {print $1}' /proc/net/dev); do
diff --git a/package/base-files/files/etc/preinit b/package/base-files/files/etc/preinit
index 76443836e3..4e706f182a 100755
--- a/package/base-files/files/etc/preinit
+++ b/package/base-files/files/etc/preinit
@@ -32,8 +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
- /sbin/hotplug2 --coldplug --set-rules-file /etc/hotplug2-init.rules
- /sbin/hotplug2 --no-coldplug --persistent --set-rules-file /etc/hotplug2-init.rules &
+ /sbin/hotplug2 --set-worker /lib/hotplug2/worker_fork.so --set-rules-file /etc/hotplug2-init.rules --no-persistent --set-coldplug-cmd /sbin/udevtrigger
+ /sbin/hotplug2 --set-worker /lib/hotplug2/worker_fork.so --set-rules-file /etc/hotplug2-init.rules --persistent &
M0=/dev/ptmx
M1=/dev/ptmx
HOTPLUG=