From 8a40c8c3ef1d481b62616fe5e9cd272d448488eb Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 13 Jul 2007 02:32:32 +0000 Subject: [PATCH] move firmware loading to hotplug2-init.rules (should fix #2056) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7955 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/etc/hotplug2-init.rules | 5 +++++ package/hotplug2/files/hotplug2.rules | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/base-files/files/etc/hotplug2-init.rules b/package/base-files/files/etc/hotplug2-init.rules index bcc4c6a9e..acfe8ca50 100644 --- a/package/base-files/files/etc/hotplug2-init.rules +++ b/package/base-files/files/etc/hotplug2-init.rules @@ -28,6 +28,11 @@ DEVPATH is set { makedev /dev/%DEVICENAME% 0644 } +FIRMWARE is set { + nothrottle + exec /sbin/hotplug-call firmware; + next +} SUBSYSTEM ~~ button { exec kill -USR1 1 ; diff --git a/package/hotplug2/files/hotplug2.rules b/package/hotplug2/files/hotplug2.rules index a6697ae86..4eb762fb0 100644 --- a/package/hotplug2/files/hotplug2.rules +++ b/package/hotplug2/files/hotplug2.rules @@ -1,9 +1,4 @@ $include /etc/hotplug2-init.rules -FIRMWARE is set { - nothrottle - exec /sbin/hotplug-call firmware; - next -} SUBSYSTEM ~~ (net|button|usb) { exec /sbin/hotplug-call %SUBSYSTEM%;