From 30951964358bd18f92a8e43646acf9955984033b Mon Sep 17 00:00:00 2001 Message-Id: <30951964358bd18f92a8e43646acf9955984033b.1377873639.git.jdenemar@redhat.com> From: "Daniel P. Berrange" Date: Tue, 13 Aug 2013 16:59:27 +0100 Subject: [PATCH] Ensure that /dev exists in the container root filesystem For https://bugzilla.redhat.com/show_bug.cgi?id=924815 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 (cherry picked from commit c13a2c282b21b129ac7a519bb8c85dcba014469b) --- src/lxc/lxc_container.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 0ab4026..8abaea0 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -868,7 +868,7 @@ static int lxcContainerMountProcFuse(virDomainDefPtr def ATTRIBUTE_UNUSED, static int lxcContainerMountFSDev(virDomainDefPtr def, const char *stateDir) { - int ret; + int ret = -1; char *path = NULL; VIR_DEBUG("Mount /dev/ stateDir=%s", stateDir); @@ -877,14 +877,24 @@ static int lxcContainerMountFSDev(virDomainDefPtr def, stateDir, def->name)) < 0) return ret; - VIR_DEBUG("Tring to move %s to /dev", path); + if (virFileMakePath("/dev") < 0) { + virReportSystemError(errno, "%s", + _("Cannot create /dev")); + goto cleanup; + } + + VIR_DEBUG("Trying to move %s to /dev", path); - if ((ret = mount(path, "/dev", NULL, MS_MOVE, NULL)) < 0) { + if (mount(path, "/dev", NULL, MS_MOVE, NULL) < 0) { virReportSystemError(errno, _("Failed to mount %s on /dev"), path); + goto cleanup; } + ret = 0; + +cleanup: VIR_FREE(path); return ret; } -- 1.8.3.2