vol_id: fix logging glue

[elogind.git] / extras / firmware / firmware.sh

diff --git a/extras/firmware/firmware.sh b/extras/firmware/firmware.sh
index 89b985ef3b59042b0e839b933f6edffd855fd158..466b6532266c1e01b45435efbf7c2a0d57e83601 100755 (executable)
--- a/extras/firmware/firmware.sh
+++ b/extras/firmware/firmware.sh
@@ -1,25 +1,23 @@
 #!/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