aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-05-30 17:09:41 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-05-30 17:09:41 +0000
commitab1592ee2ccdb7369eaad2ebd69969cca8e33e72 (patch)
treec9fac464c15eb8de7bd61e62ead0ed907d2046a1
parentdf8edcfd8ac557f67f93889fe8f7a3b27b232868 (diff)
downloadmaster-187ad058-ab1592ee2ccdb7369eaad2ebd69969cca8e33e72.tar.gz
master-187ad058-ab1592ee2ccdb7369eaad2ebd69969cca8e33e72.tar.bz2
master-187ad058-ab1592ee2ccdb7369eaad2ebd69969cca8e33e72.zip
[package] base-files: set rules file for hotplug2 in the boot script (closes #5235)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16215 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/base-files/Makefile2
-rwxr-xr-xpackage/base-files/files/etc/init.d/boot1
2 files changed, 2 insertions, 1 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 3bb809f43c..81d63d9ffd 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:=21
+PKG_RELEASE:=22
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 6ecddfb022..283c02a1ae 100755
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -53,6 +53,7 @@ start() {
killall -q hotplug2
[ -x /sbin/hotplug2 ] && /sbin/hotplug2 --override --persistent \
--set-worker /lib/hotplug2/worker_fork.so \
+ --set-rules-file /etc/hotplug2.rules \
--max-children 1 >/dev/null 2>&1 &
# the coldplugging of network interfaces needs to happen later, so we do it manually here