From: Jonas Gorski <jogo@openwrt.org>
Date: Wed, 19 Nov 2014 12:17:37 +0000 (+0000)
Subject: base-files: supress errors from ldd
X-Git-Tag: reboot~5307
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=02c6798a0dbb8f182cb6a49d75c7cd21f8462106;p=openwrt%2Fstaging%2Fjogo.git

base-files: supress errors from ldd

ldd might be called for shell scrips during sysupgrade, causing it to
complain that they are not a dynamic executables.

This is a harmless error, so supress it to avoid confusing about them
being serious ones.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 43315
---

diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
index 9123359d1b..f9b30a461b 100644
--- a/package/base-files/files/lib/upgrade/common.sh
+++ b/package/base-files/files/lib/upgrade/common.sh
@@ -3,7 +3,7 @@
 RAM_ROOT=/tmp/root
 
 [ -x /usr/bin/ldd ] || ldd() { LD_TRACE_LOADED_OBJECTS=1 $*; }
-libs() { ldd $* | sed -r 's/(.* => )?(.*) .*/\2/'; }
+libs() { ldd $* 2>/dev/null | sed -r 's/(.* => )?(.*) .*/\2/'; }
 
 install_file() { # <file> [ <file> ... ]
 	for file in "$@"; do