only warn for inherited file descriptors

As discussed in thread: http://sourceforge.net/mailarchive/forum.php?thread_name=4E5618C3.5060507%40free.fr&forum_name=lxc-devel We think it's better for now to only warn the user about a fd leaking into the container. Also remove the call to readlink() as it isn't really useful now: since the container will start anyway, the user can look into /proc/../fd or use lsof or whatever. Signed-off-by: Greg Kurz <gkurz@fr.ibm.com> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

only warn for inherited file descriptors
92c7f629 · Greg Kurz · Daniel Lezcano · 1c41ddcb · 92c7f629
Commit 92c7f629 authored Sep 13, 2011 by Greg Kurz Committed by Daniel Lezcano Sep 13, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 17 deletions

start.c src/lxc/start.c +3 -17

No files found.
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -141,7 +141,6 @@ int lxc_check_inherited(int fd_to_ignore)
 	struct dirent dirent, *direntp;
 	int fd, fddir;
 	DIR *dir;
-	int ret = 0;

 	dir = opendir("/proc/self/fd");
 	if (!dir) {
@@ -152,9 +151,6 @@ int lxc_check_inherited(int fd_to_ignore)
 	fddir = dirfd(dir);

 	while (!readdir_r(dir, &dirent, &direntp)) {
-		char procpath[64];
-		char path[PATH_MAX];
-
 		if (!direntp)
 			break;

@@ -171,22 +167,12 @@ int lxc_check_inherited(int fd_to_ignore)

 		if (match_fd(fd))
 			continue;
-		/*
-		 * found inherited fd
-		 */
-		ret = -1;

-		snprintf(procpath, sizeof(procpath), "/proc/self/fd/%d", fd);
-
-		if (readlink(procpath, path, sizeof(path)) == -1)
-			ERROR("readlink(%s) failed : %m", procpath);
-		else
-			ERROR("inherited fd %d on %s", fd, path);
+		WARN("inherited fd %d", fd);
 	}

-	if (closedir(dir))
-		ERROR("failed to close directory");
-	return ret;
+	closedir(dir); /* cannot fail */
+	return 0;
 }

 static int setup_signal_fd(sigset_t *oldmask)