You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
26 lines
1019 B
26 lines
1019 B
2 years ago
|
From ce123e87018b0345f1027950397f8556bfabb622 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
||
|
|
Date: Wed, 6 Feb 2019 12:02:15 +0100
|
||
|
|
Subject: [PATCH] test-network: ignore tunnel devices automatically added by
|
||
|
|
kernel
|
||
|
|
|
||
|
|
Fixes #10934.
|
||
|
|
|
||
|
|
(cherry picked from commit e327272d795453f68a4c30ba21eb0e887516cf68)
|
||
|
|
---
|
||
|
|
test/test-execute/exec-privatenetwork-yes.service | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/test/test-execute/exec-privatenetwork-yes.service b/test/test-execute/exec-privatenetwork-yes.service
|
||
|
|
index a38d24912f..8f5cbadf04 100644
|
||
|
|
--- a/test/test-execute/exec-privatenetwork-yes.service
|
||
|
|
+++ b/test/test-execute/exec-privatenetwork-yes.service
|
||
|
|
@@ -2,6 +2,6 @@
|
||
|
|
Description=Test for PrivateNetwork
|
||
|
|
|
||
|
|
[Service]
|
||
|
|
-ExecStart=/bin/sh -x -c '! ip link | grep ": " | grep -Ev ": (lo|sit0@.*):"'
|
||
|
|
+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@.*):"'
|
||
|
|
Type=oneshot
|
||
|
|
PrivateNetwork=yes
|