[CRIU] [PATCH] zdtm: Use /usr/bin/diff instead of /bin/diff

Laurent Dufour ldufour at linux.vnet.ibm.com
Thu Jan 14 05:43:42 PST 2016


The descriptor for test netns-nf and netns are referencing /bin/diff.
On Fedora this is a hard link to /usr/bin/diff created during the
install of the package diffutils. However this hard link doesn't exist
on Debian like systems.

Referencing /usr/bin/diff works in both cases.

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

diff --git a/test/zdtm/live/static/netns-nf.desc b/test/zdtm/live/static/netns-nf.desc
index 18ffd65b720d..682942103891 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', '/bin/diff' ], 'flags': 'suid'}
+{'flavor': 'ns uns', 'deps': [ '/bin/sh', '/sbin/iptables', '/usr/lib64/xtables/libxt_standard.so', '/usr/bin/diff' ], 'flags': 'suid'}
diff --git a/test/zdtm/live/static/netns.desc b/test/zdtm/live/static/netns.desc
index a16a25420158..d0b2c2c1a51b 100644
--- a/test/zdtm/live/static/netns.desc
+++ b/test/zdtm/live/static/netns.desc
@@ -1 +1 @@
-{'flavor': 'ns uns', 'deps': [ '/bin/sh', '/sbin/ip', '/bin/diff'], 'flags': 'suid'}
+{'flavor': 'ns uns', 'deps': [ '/bin/sh', '/sbin/ip', '/usr/bin/diff'], 'flags': 'suid'}
-- 
1.9.1



More information about the CRIU mailing list