From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Wed, 11 Sep 2013 04:17:46 +0000 (-0500)
Subject: pin_rootfs: be quiet and don't fail container start
X-Git-Tag: lxc-1.0.0.alpha2~135
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00ec333b2e6c7a29e99da196979a496fb05ee923;p=thirdparty%2Flxc.git

pin_rootfs: be quiet and don't fail container start

It's a legitimate use case to use read-only $lxcpath.  If we can't
create the pin file, then we're not worried about marking the fs
readonly on exit.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 2d95e5dad..5f9ae87e6 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -687,32 +687,23 @@ int pin_rootfs(const char *rootfs)
 	if (rootfs == NULL || strlen(rootfs) == 0)
 		return -2;
 
-	if (!realpath(rootfs, absrootfs)) {
-		INFO("failed to get real path for '%s', not pinning", rootfs);
+	if (!realpath(rootfs, absrootfs))
 		return -2;
-	}
 
-	if (access(absrootfs, F_OK)) {
-		SYSERROR("'%s' is not accessible", absrootfs);
+	if (access(absrootfs, F_OK))
 		return -1;
-	}
 
-	if (stat(absrootfs, &s)) {
-		SYSERROR("failed to stat '%s'", absrootfs);
+	if (stat(absrootfs, &s))
 		return -1;
-	}
 
 	if (!S_ISDIR(s.st_mode))
 		return -2;
 
 	ret = snprintf(absrootfspin, MAXPATHLEN, "%s%s", absrootfs, ".hold");
-	if (ret >= MAXPATHLEN) {
-		SYSERROR("pathname too long for rootfs hold file");
+	if (ret >= MAXPATHLEN)
 		return -1;
-	}
 
 	fd = open(absrootfspin, O_CREAT | O_RDWR, S_IWUSR|S_IRUSR);
-	INFO("opened %s as fd %d\n", absrootfspin, fd);
 	return fd;
 }
 
diff --git a/src/lxc/start.c b/src/lxc/start.c
index 0356fc028..2d09887d2 100644
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -669,10 +669,8 @@ int lxc_spawn(struct lxc_handler *handler)
 	 */
 
 	handler->pinfd = pin_rootfs(handler->conf->rootfs.path);
-	if (handler->pinfd == -1) {
-		ERROR("failed to pin the container's rootfs");
-		goto out_delete_net;
-	}
+	if (handler->pinfd == -1)
+		INFO("failed to pin the container's rootfs");
 
 	/* Create a process in a new set of namespaces */
 	handler->pid = lxc_clone(do_start, handler, handler->clone_flags);