From: Christian Brauner <christian.brauner@canonical.com>
Date: Thu, 27 Oct 2016 12:39:45 +0000 (+0200)
Subject: conf: use lxc_preserve_ns()
X-Git-Tag: lxc-2.1.0~260^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=64d2fcb5cfe9c82b71461efce42e5ae609730d71;p=thirdparty%2Flxc.git

conf: use lxc_preserve_ns()

Signed-off-by: Christian Brauner <christian.brauner@canonical.com>
---

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 4f21f5399..4c11161e6 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -2399,24 +2399,20 @@ static int setup_network(struct lxc_list *network)
 /* try to move physical nics to the init netns */
 void lxc_restore_phys_nics_to_netns(int netnsfd, struct lxc_conf *conf)
 {
-	int i, ret, oldfd;
-	char path[MAXPATHLEN];
+	int i, oldfd;
 	char ifname[IFNAMSIZ];
 
 	if (netnsfd < 0 || conf->num_savednics == 0)
 		return;
 
-	INFO("running to reset %d nic names", conf->num_savednics);
+	INFO("Running to reset %d nic names.", conf->num_savednics);
 
-	ret = snprintf(path, MAXPATHLEN, "/proc/self/ns/net");
-	if (ret < 0 || ret >= MAXPATHLEN) {
-		WARN("Failed to open monitor netns fd");
-		return;
-	}
-	if ((oldfd = open(path, O_RDONLY)) < 0) {
-		SYSERROR("Failed to open monitor netns fd");
+	oldfd = lxc_preserve_ns(getpid(), "net");
+	if (oldfd < 0) {
+		SYSERROR("Failed to open monitor netns fd.");
 		return;
 	}
+
 	if (setns(netnsfd, 0) != 0) {
 		SYSERROR("Failed to enter container netns to reset nics");
 		close(oldfd);