diff options
| author | acinonyx <acinonyx@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-04-03 18:21:02 +0000 |
|---|---|---|
| committer | acinonyx <acinonyx@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-04-03 18:21:02 +0000 |
| commit | 98f8e418493bfd412ac616f9965ce69e1eb6f4fa (patch) | |
| tree | 7caccc72c4bfb1bda9dd4f887197e766b410309e /package/base-files | |
| parent | 3001737bfe5d4f3a8be8b54074668e4fe52399a8 (diff) | |
[package] base-files: Use hotplug2 to download firmware
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20683 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files')
| -rw-r--r-- | package/base-files/files/etc/hotplug2-common.rules | 8 | ||||
| -rwxr-xr-x | package/base-files/files/sbin/hotplug-call | 13 |
2 files changed, 5 insertions, 16 deletions
diff --git a/package/base-files/files/etc/hotplug2-common.rules b/package/base-files/files/etc/hotplug2-common.rules index 6bc53dffe8..bb76667bb9 100644 --- a/package/base-files/files/etc/hotplug2-common.rules +++ b/package/base-files/files/etc/hotplug2-common.rules @@ -35,8 +35,8 @@ DEVPATH is set, SUBSYSTEM ~~ (input) { } DEVICENAME == device-mapper { - nothrottle - makedev /dev/mapper/control 0600 + nothrottle + makedev /dev/mapper/control 0600 } @@ -45,8 +45,8 @@ DEVPATH is set { makedev /dev/%DEVICENAME% 0644 } -FIRMWARE is set { +FIRMWARE is set, ACTION == add { nothrottle - exec /sbin/hotplug-call firmware + load-firmware /lib/firmware next } diff --git a/package/base-files/files/sbin/hotplug-call b/package/base-files/files/sbin/hotplug-call index e56460de93..0d96e80aaf 100755 --- a/package/base-files/files/sbin/hotplug-call +++ b/package/base-files/files/sbin/hotplug-call @@ -1,19 +1,8 @@ #!/bin/sh -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org export HOTPLUG_TYPE="$1" -# bypass the normal hotplug path for firmware loading -# would otherwise cause problems with drivers like bcm43xx -[ -d /sys/firmware -a "firmware" = "$HOTPLUG_TYPE" -a "add" = "$ACTION" ] && { - [ -f "/lib/firmware/$FIRMWARE" ] && { - echo 1 > "/sys$DEVPATH/loading" - dd if="/lib/firmware/$FIRMWARE" of="/sys$DEVPATH/data" bs=64k - echo 0 > "/sys$DEVPATH/loading" - } || echo -1 > "/sys$DEVPATH/loading" - exit 0 -} - . /etc/functions.sh PATH=/bin:/sbin:/usr/bin:/usr/sbin |