瀏覽代碼

Exclude the user namespace for setns
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)

Michael Crosby 11 年之前
父節點
當前提交
7eb508633d
共有 1 個文件被更改,包括 2 次插入1 次删除
  1. 2 1
      pkg/libcontainer/namespaces/nsenter.go

+ 2 - 1
pkg/libcontainer/namespaces/nsenter.go

@@ -85,8 +85,9 @@ void nsenter() {
 		fprintf(stderr, "nsenter: Failed to open directory \"%s\" with error: \"%s\"\n", ns_dir, strerror(errno));
 		fprintf(stderr, "nsenter: Failed to open directory \"%s\" with error: \"%s\"\n", ns_dir, strerror(errno));
 		exit(1);
 		exit(1);
 	}
 	}
+
 	while((dent = readdir(dir)) != NULL) {
 	while((dent = readdir(dir)) != NULL) {
-		if(strcmp(dent->d_name, ".") == 0 || strcmp(dent->d_name, "..") == 0) {
+		if(strcmp(dent->d_name, ".") == 0 || strcmp(dent->d_name, "..") == 0 || strcmp(dent->d_name, "user") == 0) {
 			continue;
 			continue;
 		}
 		}