From 6e9edde6c962ab183e8d86086bddda7aa6e3cb9b Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Tue, 16 Oct 2007 00:54:14 +0200 Subject: [PATCH] firmware: do not print error if logger is missing --- extras/firmware/firmware.sh | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/extras/firmware/firmware.sh b/extras/firmware/firmware.sh index 49845bad0..b89b4282c 100755 --- a/extras/firmware/firmware.sh +++ b/extras/firmware/firmware.sh @@ -3,23 +3,21 @@ FIRMWARE_DIRS="/lib/firmware /usr/local/lib/firmware" err() { - echo "$@" >&2 - if type logger >/dev/null; then - 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 -- 2.30.2