| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 1 | From 76d8343ad300f6507233abcdf97629290e35848a Mon Sep 17 00:00:00 2001 |
| 2 | From: Lei Yang <Lei.Yang@windriver.com> |
| 3 | Date: Wed, 29 Aug 2018 11:51:24 +0800 |
| 4 | Subject: [PATCH] netns_helper.sh: use 'ping -6' when ping6 is not avaliable |
| 5 | |
| 6 | ping6 has been merged into ping since 2015 by using "ping -6" |
| 7 | in some distributions (e.g. OpenEmbedded) they dropped ping6 completely |
| 8 | this patch will let both "ping -6" and ping6 work. |
| 9 | |
| 10 | [pvorel: change was done in s20150815: |
| 11 | ebad35f ("ping: merge `ping6` command into `ping`"), |
| 12 | before that release switch '-6' didn't exist. |
| 13 | Upstream leaves ping6 symlink to distributions.] |
| 14 | |
| 15 | Upstream-Status: Backport |
| 16 | [https://github.com/linux-test-project/ltp/commit/76d8343ad300f6507233abcdf97629290e35848a] |
| 17 | |
| 18 | Signed-off-by: Lei Yang <Lei.Yang@windriver.com> |
| 19 | Signed-off-by: Petr Vorel <pvorel@suse.cz> |
| 20 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
| 21 | --- |
| 22 | testcases/kernel/containers/netns/netns_helper.sh | 7 ++++++- |
| 23 | 1 file changed, 6 insertions(+), 1 deletion(-) |
| 24 | |
| 25 | diff --git a/testcases/kernel/containers/netns/netns_helper.sh b/testcases/kernel/containers/netns/netns_helper.sh |
| 26 | index 6aea10b..a9d0459 100755 |
| 27 | --- a/testcases/kernel/containers/netns/netns_helper.sh |
| 28 | +++ b/testcases/kernel/containers/netns/netns_helper.sh |
| 29 | @@ -168,7 +168,12 @@ netns_setup() |
| 30 | ipv6) |
| 31 | IFCONF_IN6_ARG="inet6 add" |
| 32 | IP0=$6; IP1=$7; |
| 33 | - tping="ping6"; NETMASK=64 |
| 34 | + if which ping6 >/dev/null 2>&1; then |
| 35 | + tping="ping6" |
| 36 | + else |
| 37 | + tping="ping -6" |
| 38 | + fi |
| 39 | + NETMASK=64 |
| 40 | ;; |
| 41 | *) |
| 42 | tst_brkm TBROK "second argument must be an ip version (ipv4|ipv6)" |
| 43 | -- |
| 44 | 2.7.4 |
| 45 | |