From: Kay Sievers <kay.sievers@vrfy.org>
Date: Mon, 15 Oct 2007 22:54:14 +0000 (+0200)
Subject: firmware: do not print error if logger is missing
X-Git-Tag: 174~1801
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=6e9edde6c962ab183e8d86086bddda7aa6e3cb9b

firmware: do not print error if logger is missing
---

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