提交 61e672b2 编写于 作者: D Daniel P. Berrange

Remove legacy code for single-instance devpts filesystem

Earlier commit f7e8653f dropped support for using LXC with
kernels having single-instance devpts filesystem from the
LXC controller. It forgot to remove the same code from the
LXC container setup.
Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
上级 77e7f69c
...@@ -869,25 +869,14 @@ static int lxcContainerPopulateDevices(char **ttyPaths, size_t nttyPaths) ...@@ -869,25 +869,14 @@ static int lxcContainerPopulateDevices(char **ttyPaths, size_t nttyPaths)
} }
} }
if (access("/dev/pts/ptmx", W_OK) == 0) { /* We have private devpts capability, so bind that */
/* We have private devpts capability, so bind that */ if (virFileTouch("/dev/ptmx", 0666) < 0)
if (virFileTouch("/dev/ptmx", 0666) < 0) return -1;
return -1;
if (mount("/dev/pts/ptmx", "/dev/ptmx", "ptmx", MS_BIND, NULL) < 0) { if (mount("/dev/pts/ptmx", "/dev/ptmx", "ptmx", MS_BIND, NULL) < 0) {
virReportSystemError(errno, "%s", virReportSystemError(errno, "%s",
_("Failed to bind /dev/pts/ptmx on to /dev/ptmx")); _("Failed to bind /dev/pts/ptmx on to /dev/ptmx"));
return -1; return -1;
}
} else {
/* Legacy devpts, so we need to just use shared one */
dev_t dev = makedev(LXC_DEV_MAJ_TTY, LXC_DEV_MIN_PTMX);
if (mknod("/dev/ptmx", S_IFCHR, dev) < 0 ||
chmod("/dev/ptmx", 0666)) {
virReportSystemError(errno, "%s",
_("Failed to make device /dev/ptmx"));
return -1;
}
} }
for (i = 0; i < nttyPaths; i++) { for (i = 0; i < nttyPaths; i++) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册