From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Fri, 15 Feb 2019 22:42:30 +0000 (+0100)
Subject: conf: do not log devpts umount2() failure
X-Git-Tag: lxc-3.2.0~147^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29a7b484ffa86e8b552bd90dc26d9ea5f577eed2;p=thirdparty%2Flxc.git

conf: do not log devpts umount2() failure

We're not acting based on the return value so don't log anything.

Fixes: https://discuss.linuxcontainers.org/t/warning-in-the-container-log/4072/2
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 65011cef3..cb5730af6 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -1639,11 +1639,7 @@ static int lxc_setup_devpts(struct lxc_conf *conf)
 	if (ret < 0 || (size_t)ret >= sizeof(devpts_mntopts))
 		return -1;
 
-	ret = umount2("/dev/pts", MNT_DETACH);
-	if (ret < 0)
-		SYSWARN("Failed to unmount old devpts instance");
-	else
-		DEBUG("Unmounted old devpts instance");
+	(void)umount2("/dev/pts", MNT_DETACH);
 
 	/* Create mountpoint for devpts instance. */
 	ret = mkdir("/dev/pts", 0755);