[lxc-devel] [lxc/master] dlog: move match_dlog_fds()

2xsec on Github lxc-bot at linuxcontainers.org
Thu Nov 8 10:19:27 UTC 2018


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 346 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20181108/b2be0099/attachment.bin>
-------------- next part --------------
From 1d5e5f26b8cba168cccb01dc5849cbbd782376f4 Mon Sep 17 00:00:00 2001
From: 2xsec <dh48.jeong at samsung.com>
Date: Thu, 8 Nov 2018 19:18:41 +0900
Subject: [PATCH] dlog: move match_dlog_fds()

Signed-off-by: 2xsec <dh48.jeong at samsung.com>
---
 src/lxc/start.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/lxc/start.c b/src/lxc/start.c
index 1cdae6c7a..dae3bcfe5 100644
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -297,17 +297,17 @@ int lxc_check_inherited(struct lxc_conf *conf, bool closeall,
 		if (matched)
 			continue;
 
-#ifdef HAVE_DLOG
-		if (match_dlog_fds(direntp))
-			continue;
-
-#endif
 		if (current_config && fd == current_config->logfd)
 			continue;
 
 		if (match_stdfds(fd))
 			continue;
 
+#ifdef HAVE_DLOG
+		if (match_dlog_fds(direntp))
+			continue;
+
+#endif
 		if (closeall) {
 			close(fd);
 			closedir(dir);


More information about the lxc-devel mailing list