External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-10 23:07:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure that /dev exists in the container root filesystem

Browse Source 
If booting a container with a root FS that isn't the host's
root, we must ensure that the /dev mount point exists.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2013-08-13 14:58:45 +01:00
parent 63ba687f2b
commit c13a2c282b
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lxc/lxc_container.c
View File

@ -868,7 +868,7 @@ static int lxcContainerMountProcFuse(virDomainDefPtr def ATTRIBUTE_UNUSED,
static int lxcContainerMountFSDev(virDomainDefPtr def, static int lxcContainerMountFSDev(virDomainDefPtr def,
const char *stateDir) const char *stateDir)
{ {
int ret; int ret = -1;
char *path = NULL; char *path = NULL;
VIR_DEBUG("Mount /dev/ stateDir=%s", stateDir); VIR_DEBUG("Mount /dev/ stateDir=%s", stateDir);
@ -877,14 +877,24 @@ static int lxcContainerMountFSDev(virDomainDefPtr def,
stateDir, def->name)) < 0) stateDir, def->name)) < 0)
return ret; return ret;
VIR_DEBUG("Tring to move %s to /dev", path); if (virFileMakePath("/dev") < 0) {
virReportSystemError(errno, "%s",
_("Cannot create /dev"));
goto cleanup;
}
if ((ret = mount(path, "/dev", NULL, MS_MOVE, NULL)) < 0) { VIR_DEBUG("Trying to move %s to /dev", path);
if (mount(path, "/dev", NULL, MS_MOVE, NULL) < 0) {
virReportSystemError(errno, virReportSystemError(errno,
_("Failed to mount %s on /dev"), _("Failed to mount %s on /dev"),
path); path);
goto cleanup;
} }
ret = 0;
cleanup:
VIR_FREE(path); VIR_FREE(path);
return ret; return ret;
} }