Re: Location of firmware files

["Marco d'Itri" <md@Linux.IT>]

[-- Attachment #1: Type: text/plain, Size: 287 bytes --]

On Jun 22, Brian King <brking@us.ibm.com> wrote:

> Getting back to the following thread regarding the proper location
> for firmware files:
FYI, I applied this patch to the debian package, because some firmwares
are needed before / is mounted.

-- 
ciao, |
Marco | [6878 svWwedgktgMa2]

[-- Attachment #2: firmware_dirs --]
[-- Type: text/plain, Size: 1154 bytes --]

diff -ruN hotplug-2004_03_29.orig/etc/hotplug/firmware.agent hotplug-2004_03_29/etc/hotplug/firmware.agent
--- hotplug-2004_03_29.orig/etc/hotplug/firmware.agent	2004-03-26 23:34:34.000000000 +0100
+++ hotplug-2004_03_29/etc/hotplug/firmware.agent	2004-06-06 17:05:35.000000000 +0200
@@ -19,8 +19,8 @@
 . ./hotplug.functions
 # DEBUG=yes export DEBUG
 
-# directory of the firmware files
-FIRMWARE_DIR=/usr/lib/hotplug/firmware
+# directories with the firmware files
+FIRMWARE_DIRS="/lib/firmware /usr/lib/hotplug/firmware"
 
 # mountpoint of sysfs
 SYSFS=$(sed -n 's/^.* \([^ ]*\) sysfs .*$/\1/p' /proc/mounts)
@@ -40,13 +40,16 @@
         sleep 1
     fi
 
-    if [ -f "$FIRMWARE_DIR/$FIRMWARE" ]; then
+    for DIR in $FIRMWARE_DIRS; do
+        [ -e "$DIR/$FIRMWARE" ] || continue
         echo 1 > $SYSFS/$DEVPATH/loading
-        cp "$FIRMWARE_DIR/$FIRMWARE" $SYSFS/$DEVPATH/data
+        cat "$DIR/$FIRMWARE" > $SYSFS/$DEVPATH/data
         echo 0 > $SYSFS/$DEVPATH/loading
-    else
-        echo -1 > $SYSFS/$DEVPATH/loading
-    fi
+        exit
+    done
+
+    # the firmware was not found
+    echo -1 > $SYSFS/$DEVPATH/loading
 
     ;;