[CRIU] [PATCH] tests: add '/bin/ip' to deps in addition to '/sbin/ip'
Andrey Ryabinin
aryabinin at virtuozzo.com
Mon Jan 30 07:18:15 PST 2017
Some distros put 'ip' util in /bin directory.
Signed-off-by: Andrey Ryabinin <aryabinin at virtuozzo.com>
---
test/zdtm/static/bridge.desc | 2 +-
test/zdtm/static/cr_veth.desc | 2 +-
test/zdtm/static/macvlan.desc | 2 +-
test/zdtm/static/netns.desc | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/test/zdtm/static/bridge.desc b/test/zdtm/static/bridge.desc
index 9d64973..a6110d6 100644
--- a/test/zdtm/static/bridge.desc
+++ b/test/zdtm/static/bridge.desc
@@ -1,7 +1,7 @@
{ 'deps': [ '/bin/sh',
'/usr/bin/sort',
'/bin/grep',
- '/sbin/ip',
+ '/sbin/ip|/bin/ip',
'/usr/bin/diff'],
'flags': 'suid',
'flavor': 'ns uns'}
diff --git a/test/zdtm/static/cr_veth.desc b/test/zdtm/static/cr_veth.desc
index 0c2cc20..1273122 100644
--- a/test/zdtm/static/cr_veth.desc
+++ b/test/zdtm/static/cr_veth.desc
@@ -1,4 +1,4 @@
-{ 'deps': ['/bin/sh', '/bin/sed', '/bin/grep', '/sbin/ip', '/usr/bin/diff'],
+{ 'deps': ['/bin/sh', '/bin/sed', '/bin/grep', '/sbin/ip|/bin/ip', '/usr/bin/diff'],
'flags': 'suid',
'flavor': 'ns uns',
'ropts': '--external veth[zdtmvthc0]:zdtmvthh0 at zdtmbr0'}
diff --git a/test/zdtm/static/macvlan.desc b/test/zdtm/static/macvlan.desc
index a9c2ae5..cf0fee4 100644
--- a/test/zdtm/static/macvlan.desc
+++ b/test/zdtm/static/macvlan.desc
@@ -1,7 +1,7 @@
{ 'deps': [ '/bin/sh',
'/usr/bin/sort',
'/bin/grep',
- '/sbin/ip',
+ '/sbin/ip|/bin/ip',
'/usr/bin/diff'],
'flags': 'suid',
'flavor': 'ns uns',
diff --git a/test/zdtm/static/netns.desc b/test/zdtm/static/netns.desc
index 202d9a0..b9f9d28 100644
--- a/test/zdtm/static/netns.desc
+++ b/test/zdtm/static/netns.desc
@@ -1,3 +1,3 @@
-{ 'deps': ['/bin/sh', '/sbin/ip', '/usr/bin/diff'],
+{ 'deps': ['/bin/sh', '/sbin/ip|/bin/ip', '/usr/bin/diff'],
'flags': 'suid',
'flavor': 'ns uns'}
--
2.10.2
More information about the CRIU
mailing list