36e8a3
From ce123e87018b0345f1027950397f8556bfabb622 Mon Sep 17 00:00:00 2001
36e8a3
From: Yu Watanabe <watanabe.yu+github@gmail.com>
36e8a3
Date: Wed, 6 Feb 2019 12:02:15 +0100
36e8a3
Subject: [PATCH] test-network: ignore tunnel devices automatically added by
36e8a3
 kernel
36e8a3
36e8a3
Fixes #10934.
36e8a3
36e8a3
(cherry picked from commit e327272d795453f68a4c30ba21eb0e887516cf68)
36e8a3
---
36e8a3
 test/test-execute/exec-privatenetwork-yes.service | 2 +-
36e8a3
 1 file changed, 1 insertion(+), 1 deletion(-)
36e8a3
36e8a3
diff --git a/test/test-execute/exec-privatenetwork-yes.service b/test/test-execute/exec-privatenetwork-yes.service
4bff0a
index a38d24912f..8f5cbadf04 100644
36e8a3
--- a/test/test-execute/exec-privatenetwork-yes.service
36e8a3
+++ b/test/test-execute/exec-privatenetwork-yes.service
36e8a3
@@ -2,6 +2,6 @@
36e8a3
 Description=Test for PrivateNetwork
36e8a3
 
36e8a3
 [Service]
36e8a3
-ExecStart=/bin/sh -x -c '! ip link | grep ": " | grep -Ev ": (lo|sit0@.*):"'
36e8a3
+ExecStart=/bin/sh -x -c '! ip link | grep -E "^[0-9]+: " | grep -Ev ": (lo|(erspan|gre|gretap|ip_vti|ip6_vti|ip6gre|ip6tnl|sit|tunl)0@.*):"'
36e8a3
 Type=oneshot
36e8a3
 PrivateNetwork=yes