External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

lxc: Bind mount container TTYs

Browse Source 
Instead of creating symlinks, bind mount the devices to
/dev/pts/XY.
Using bind mounts it is no longer needed to add pts devices
to files like /etc/securetty.

Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
Richard Weinberger 2015-06-23 16:38:57 +02:00 committed by Daniel P. Berrange
parent ea542455b4
commit 370707a7a9
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/lxc/lxc_container.c
View File

@ -1142,6 +1142,20 @@ static int lxcContainerMountFSDevPTS(virDomainDefPtr def,
return ret; return ret;
} }
static int lxcContainerBindMountDevice(const char *src, const char *dst)
{
if (virFileTouch(dst, 0666) < 0)
return -1;
if (mount(src, dst, "none", MS_BIND, NULL) < 0) {
virReportSystemError(errno, _("Failed to bind %s on to %s"), src,
dst);
return -1;
}
return 0;
}
static int lxcContainerSetupDevices(char **ttyPaths, size_t nttyPaths) static int lxcContainerSetupDevices(char **ttyPaths, size_t nttyPaths)
{ {
size_t i; size_t i;
@ -1165,34 +1179,24 @@ static int lxcContainerSetupDevices(char **ttyPaths, size_t nttyPaths)
} }
/* We have private devpts capability, so bind that */ /* We have private devpts capability, so bind that */
if (virFileTouch("/dev/ptmx", 0666) < 0) if (lxcContainerBindMountDevice("/dev/pts/ptmx", "/dev/ptmx") < 0)
return -1; return -1;
if (mount("/dev/pts/ptmx", "/dev/ptmx", "ptmx", MS_BIND, NULL) < 0) {
virReportSystemError(errno, "%s",
_("Failed to bind /dev/pts/ptmx on to /dev/ptmx"));
return -1;
}
for (i = 0; i < nttyPaths; i++) { for (i = 0; i < nttyPaths; i++) {
char *tty; char *tty;
if (virAsprintf(&tty, "/dev/tty%zu", i+1) < 0) if (virAsprintf(&tty, "/dev/tty%zu", i+1) < 0)
return -1; return -1;
if (symlink(ttyPaths[i], tty) < 0) {
virReportSystemError(errno, if (lxcContainerBindMountDevice(ttyPaths[i], tty) < 0) {
_("Failed to symlink %s to %s"), return -1;
ttyPaths[i], tty);
VIR_FREE(tty); VIR_FREE(tty);
return -1;
} }
VIR_FREE(tty); VIR_FREE(tty);
if (i == 0 && if (i == 0 &&
symlink(ttyPaths[i], "/dev/console") < 0) { lxcContainerBindMountDevice(ttyPaths[i], "/dev/console") < 0)
virReportSystemError(errno,
_("Failed to symlink %s to /dev/console"),
ttyPaths[i]);
return -1; return -1;
}
} }
return 0; return 0;
} }