diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-09 18:18:44 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-09 18:39:26 +0100 |
commit | 5a83e50250aaea33e2c55b2f13796565c02e80af (patch) | |
tree | 278e7a4a18ff617a74659243df016fe16d7e148c | |
parent | 32bb9c3184cd51c1407a5a51fc1153f54ceba20e (diff) | |
download | poky-5a83e50250aaea33e2c55b2f13796565c02e80af.tar.gz |
runqemu-internal: Hide some harmless warning messages
If sudo is used in the pseudo environment, as done in image tests when
the user hasn't pre-setup the tap device, ensure the LD_PRELOAD error
message isn't seen by the user.
(From OE-Core rev: 86234ac514cbd33a0058f3b74f158daeda325c0d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-x | scripts/runqemu-internal | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal index 4f6909b734..ce3291f3a9 100755 --- a/scripts/runqemu-internal +++ b/scripts/runqemu-internal | |||
@@ -173,7 +173,9 @@ if [ "$TAP" = "" ]; then | |||
173 | 173 | ||
174 | GROUPID=`id -g` | 174 | GROUPID=`id -g` |
175 | echo "Setting up tap interface under sudo" | 175 | echo "Setting up tap interface under sudo" |
176 | tap=`sudo $QEMUIFUP $GROUPID $OECORE_NATIVE_SYSROOT` | 176 | # Redirect stderr since we could see a LD_PRELOAD warning here if pseudo is loaded |
177 | # but inactive. This looks scary but is harmless | ||
178 | tap=`sudo $QEMUIFUP $GROUPID $OECORE_NATIVE_SYSROOT 2> /dev/null` | ||
177 | if [ $? -ne 0 ]; then | 179 | if [ $? -ne 0 ]; then |
178 | # Re-run standalone to see verbose errors | 180 | # Re-run standalone to see verbose errors |
179 | sudo $QEMUIFUP $GROUPID $OECORE_NATIVE_SYSROOT | 181 | sudo $QEMUIFUP $GROUPID $OECORE_NATIVE_SYSROOT |
@@ -191,7 +193,9 @@ fi | |||
191 | 193 | ||
192 | cleanup() { | 194 | cleanup() { |
193 | if [ ! -e "$NOSUDO_FLAG" ]; then | 195 | if [ ! -e "$NOSUDO_FLAG" ]; then |
194 | sudo $QEMUIFDOWN $TAP $OECORE_NATIVE_SYSROOT | 196 | # Redirect stderr since we could see a LD_PRELOAD warning here if pseudo is loaded |
197 | # but inactive. This looks scary but is harmless | ||
198 | sudo $QEMUIFDOWN $TAP $OECORE_NATIVE_SYSROOT 2> /dev/null | ||
195 | fi | 199 | fi |
196 | echo "Releasing lockfile of preconfigured tap device '$TAP'" | 200 | echo "Releasing lockfile of preconfigured tap device '$TAP'" |
197 | release_lock $LOCKFILE | 201 | release_lock $LOCKFILE |