X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Ffirmware%2Ffirmware.sh;h=9d4659a34d789b621c89d7b7b6e74969df76652e;hp=b89b4282c78425e907152ce6d32c2995b3b92022;hb=9fd2e7e95d9f782958becf8310eea1a11af10d35;hpb=6e9edde6c962ab183e8d86086bddda7aa6e3cb9b

diff --git a/extras/firmware/firmware.sh b/extras/firmware/firmware.sh
index b89b4282c..9d4659a34 100755
--- a/extras/firmware/firmware.sh
+++ b/extras/firmware/firmware.sh
@@ -1,6 +1,7 @@
 #!/bin/sh -e
 
-FIRMWARE_DIRS="/lib/firmware /usr/local/lib/firmware"
+FIRMWARE_DIRS="/lib/firmware/updates/$(uname -r) /lib/firmware/updates \
+               /lib/firmware/$(uname -r) /lib/firmware"
 
 err() {
 	echo "$@" >&2
@@ -22,4 +23,7 @@ done
 
 echo -1 > /sys$DEVPATH/loading
 err "Cannot find  firmware file '$FIRMWARE'"
+mkdir -p /dev/.udev/firmware-missing
+file=$(echo "$FIRMWARE" | sed 's:/:\\x2f:g')
+ln -s -f "$DEVPATH" /dev/.udev/firmware-missing/$file
 exit 1