X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Ffirmware%2Ffirmware.sh;h=466b6532266c1e01b45435efbf7c2a0d57e83601;hp=fb2f2a792d6acd64524b5dd424c62e5d308c2baf;hb=b2946df41965632c80012921a2cacbf83bc3dd80;hpb=1388c830117d68bb623043d9e1803b34ddade8e5

diff --git a/extras/firmware/firmware.sh b/extras/firmware/firmware.sh
index fb2f2a792..466b65322 100755
--- a/extras/firmware/firmware.sh
+++ b/extras/firmware/firmware.sh
@@ -1,27 +1,25 @@
 #!/bin/sh -e
 
-FIRMWARE_DIRS="/lib/firmware /usr/local/lib/firmware"
+FIRMWARE_DIRS="/lib/firmware/$(uname -r) /lib/firmware"
 
 err() {
-    echo "$@" >&2
-    if [ -x /bin/logger ]; then
-	/bin/logger -t "${0##*/}[$$]" "$@"
-    fi
+	echo "$@" >&2
+	logger -t "${0##*/}[$$]" "$@" 2>/dev/null || true
 }
 
 if [ ! -e /sys$DEVPATH/loading ]; then
-    err "udev firmware loader misses sysfs directory"
-    exit 1
+	err "udev firmware loader misses sysfs directory"
+	exit 1
 fi
 
 for DIR in $FIRMWARE_DIRS; do
-    [ -e "$DIR/$FIRMWARE" ] || continue
-    echo 1 > /sys/$DEVPATH/loading
-    cat "$DIR/$FIRMWARE" > /sys/$DEVPATH/data
-    echo 0 > /sys/$DEVPATH/loading
-    exit 0
+	[ -e "$DIR/$FIRMWARE" ] || continue
+	echo 1 > /sys$DEVPATH/loading
+	cat "$DIR/$FIRMWARE" > /sys$DEVPATH/data
+	echo 0 > /sys$DEVPATH/loading
+	exit 0
 done
 
-echo -1 > /sys/$DEVPATH/loading
+echo -1 > /sys$DEVPATH/loading
 err "Cannot find  firmware file '$FIRMWARE'"
 exit 1