[CRIU] [PATCH 4/4] check: also check tun support in mainline

Tycho Andersen tycho.andersen at canonical.com
Thu Oct 15 15:28:10 PDT 2015


As of
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=fb7589a1
tun support is merged, so let's check it in ms as well.

Signed-off-by: Tycho Andersen <tycho.andersen at canonical.com>
---
 tun.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tun.c b/tun.c
index aeca62b..14012f2 100644
--- a/tun.c
+++ b/tun.c
@@ -54,11 +54,6 @@ int check_tun_cr(int no_tun_err)
 {
 	int fd, idx = 13, ret;
 
-	if (opts.check_ms_kernel) {
-		pr_warn("Skipping tun support check\n");
-		return 0;
-	}
-
 	fd = open(TUN_DEV_GEN_PATH, O_RDWR);
 	if (fd < 0) {
 		pr_perror("Can't check tun support");
-- 
2.1.4



More information about the CRIU mailing list