[CRIU] [PATCH 2/2] zdtm/test: Fix live/static/netns-nf dependency

Laurent Dufour ldufour at linux.vnet.ibm.com
Fri Jan 15 00:33:43 PST 2016


This test calls iptables to set a new packet filter using a shared
library libxt_standard.so. Unfortunately, depending on the
distribution we are running on, this shared library may be stored on a
different place.

This patch allows this test to be run on Debian like systems.

Signed-off-by: Laurent Dufour <ldufour at linux.vnet.ibm.com>
---
 test/zdtm/live/static/netns-nf.desc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/zdtm/live/static/netns-nf.desc b/test/zdtm/live/static/netns-nf.desc
index 682942103891..c43840580036 100644
--- a/test/zdtm/live/static/netns-nf.desc
+++ b/test/zdtm/live/static/netns-nf.desc
@@ -1 +1 @@
-{'flavor': 'ns uns', 'deps': [ '/bin/sh', '/sbin/iptables', '/usr/lib64/xtables/libxt_standard.so', '/usr/bin/diff' ], 'flags': 'suid'}
+{'flavor': 'ns uns', 'deps': [ '/bin/sh', '/sbin/iptables', '/usr/lib64/xtables/libxt_standard.so|/lib/xtables/libxt_standard.so', '/usr/bin/diff' ], 'flags': 'suid'}
-- 
1.9.1



More information about the CRIU mailing list