diff options
| author | Vasilis Tsiligiannis <acinonyx@openwrt.gr> | 2013-01-11 13:20:51 +0000 |
|---|---|---|
| committer | Vasilis Tsiligiannis <acinonyx@openwrt.gr> | 2013-01-11 13:20:51 +0000 |
| commit | 674439299ff49acf98ef0104337fbc154ebfe653 (patch) | |
| tree | e52f6703e115b859087786c05ecc9db8b2a1b43f | |
| parent | a27167aa132917a3b25b6c6f102daef7bb01a812 (diff) | |
| download | upstream-674439299ff49acf98ef0104337fbc154ebfe653.tar.gz upstream-674439299ff49acf98ef0104337fbc154ebfe653.tar.bz2 upstream-674439299ff49acf98ef0104337fbc154ebfe653.zip | |
base-files: Don't pass '--set-worker /lib/hotplug2/worker_fork.so' to hotplug2 (#12781)
SVN-Revision: 35095
| -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 0e72c188d5..5bb2e25652 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 5b3e2ad000..8379e5e74f 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() { |