naccyde / rpms / systemd

Forked from rpms/systemd a year ago
Clone
ff6046
From ce123e87018b0345f1027950397f8556bfabb622 Mon Sep 17 00:00:00 2001
ff6046
From: Yu Watanabe <watanabe.yu+github@gmail.com>
ff6046
Date: Wed, 6 Feb 2019 12:02:15 +0100
ff6046
Subject: [PATCH] test-network: ignore tunnel devices automatically added by
ff6046
 kernel
ff6046
ff6046
Fixes #10934.
ff6046
ff6046
(cherry picked from commit e327272d795453f68a4c30ba21eb0e887516cf68)
ff6046
---
ff6046
 test/test-execute/exec-privatenetwork-yes.service | 2 +-
ff6046
 1 file changed, 1 insertion(+), 1 deletion(-)
ff6046
ff6046
diff --git a/test/test-execute/exec-privatenetwork-yes.service b/test/test-execute/exec-privatenetwork-yes.service
ff6046
index a38d24912f..8f5cbadf04 100644
ff6046
--- a/test/test-execute/exec-privatenetwork-yes.service
ff6046
+++ b/test/test-execute/exec-privatenetwork-yes.service
ff6046
@@ -2,6 +2,6 @@
ff6046
 Description=Test for PrivateNetwork
ff6046
 
ff6046
 [Service]
ff6046
-ExecStart=/bin/sh -x -c '! ip link | grep ": " | grep -Ev ": (lo|sit0@.*):"'
ff6046
+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@.*):"'
ff6046
 Type=oneshot
ff6046
 PrivateNetwork=yes