mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-30 13:58:34 +00:00
Code Issues Releases Wiki Activity

zdtm: exclude vdso before modifing output of ldd

Browse Source 
ldd pipe00:
linux-vdso.so.1 =>  (0x00007fffbb0cb000)

Currently the first part of line is dropts, if the line contains "=>",
so we need to exclude vdso, before modifing lines.

This patch fixes bug:
$ zdtm.sh ns/static/pipe00
Failed at  (0x00007fffa49fe000)

Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Andrey Vagin
2013-07-11 22:32:27 +04:00
committed by Pavel Emelyanov
parent ec6b8e77e5
commit ae44dd36a1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/zdtm.sh
View File

@@ -235,7 +235,7 @@ construct_root()
# libc.so.6 => /lib/arm-linux-gnueabihf/libc.so.6 (0xb6dc5000) # libc.so.6 => /lib/arm-linux-gnueabihf/libc.so.6 (0xb6dc5000)
# /lib/ld-linux-armhf.so.3 (0xb6f0b000) # /lib/ld-linux-armhf.so.3 (0xb6f0b000)
for i in `ldd $test_path $ps_path | grep -P '^\s' | sed "s/.*=> //" | awk '{ print $1 }' | grep -v vdso`; do for i in `ldd $test_path $ps_path | grep -P '^\s' | grep -v vdso | sed "s/.*=> //" | awk '{ print $1 }'`; do
local lib=`basename $i` local lib=`basename $i`
[ -f $libdir/$lib ] && continue || [ -f $libdir/$lib ] && continue ||
[ -f $i ] && cp $i $libdir && cp $i $libdir2 && continue || [ -f $i ] && cp $i $libdir && cp $i $libdir2 && continue ||