From: Daniel Lezcano <daniel.lezcano@free.fr>
Date: Sun, 3 Oct 2010 21:09:35 +0000 (+0200)
Subject: use the rootfs mount point for the console
X-Git-Tag: lxc-0.7.3~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=466978b083462faa77791aff566a648b51e39d31;p=thirdparty%2Flxc.git

use the rootfs mount point for the console

The rootfs is always located in the mount point now, let's
use it.

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index aae52f458..775583789 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -690,10 +690,11 @@ static int setup_console(const struct lxc_rootfs *rootfs,
 	if (!rootfs->path)
 		return 0;
 
-	snprintf(path, sizeof(path), "%s/dev/console", rootfs->path);
+	snprintf(path, sizeof(path), "%s/dev/console",
+		 rootfs->mount ? rootfs->mount : LXCROOTFSMOUNT);
 
 	if (access(path, F_OK)) {
-		WARN("rootfs specified but no console found");
+		WARN("rootfs specified but no console found at '%s'", path);
 		return 0;
 	}