diff options
| author | acinonyx <acinonyx@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-01-11 13:20:51 +0000 |
|---|---|---|
| committer | acinonyx <acinonyx@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-01-11 13:20:51 +0000 |
| commit | 04d51e9b5ee038bd5c897964916cdaaf717a67df (patch) | |
| tree | b782db8bc9bd97f23b6d74991399e6f85b8d8d46 | |
| parent | 86e05ace624a1e61de9dfd93efeba6c72205329c (diff) | |
[package] base-files: Don't pass '--set-worker /lib/hotplug2/worker_fork.so' to hotplug2 (#12781)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35095 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/base-files/Makefile | 4 | ||||
| -rw-r--r-- | package/base-files/files/lib/preinit/30_device_fs_daemons | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 0e72c188d..5bb2e2565 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2012 OpenWrt.org +# Copyright (C) 2007-2013 OpenWrt.org # Copyright (C) 2010 Vertical Communications # # This is free software, licensed under the GNU General Public License v2. @@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/version.mk PKG_NAME:=base-files -PKG_RELEASE:=123 +PKG_RELEASE:=124 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ PKG_BUILD_DEPENDS:=opkg/host diff --git a/package/base-files/files/lib/preinit/30_device_fs_daemons b/package/base-files/files/lib/preinit/30_device_fs_daemons index 5b3e2ad00..8379e5e74 100644 --- a/package/base-files/files/lib/preinit/30_device_fs_daemons +++ b/package/base-files/files/lib/preinit/30_device_fs_daemons @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2013 OpenWrt.org # Copyright (C) 2010 Vertical Communications init_devfs() { @@ -8,8 +8,8 @@ init_devfs() { init_hotplug2() { [ -c /dev/console ] || mknod /dev/console c 5 1 - /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 & + /sbin/hotplug2 --set-rules-file /etc/hotplug2-init.rules --no-persistent --set-coldplug-cmd /sbin/udevtrigger + /sbin/hotplug2 --set-rules-file /etc/hotplug2-init.rules --persistent & } init_udev() { |