From: Serge Hallyn <serge@hallyn.com>
Date: Sat, 26 Nov 2016 06:07:15 +0000 (-0600)
Subject: lvm: supress warnings about leaked files
X-Git-Tag: lxc-2.1.0~246^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1323%2Fhead;p=thirdparty%2Flxc.git

lvm: supress warnings about leaked files

Closes #1283

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

diff --git a/src/lxc/bdev/lxclvm.c b/src/lxc/bdev/lxclvm.c
index 3d41b10fb..db0e21cf6 100644
--- a/src/lxc/bdev/lxclvm.c
+++ b/src/lxc/bdev/lxclvm.c
@@ -105,6 +105,7 @@ extern char *dir_new_path(char *src, const char *oldname, const char *name,
 			tp = NULL;
 	}
 
+	(void)setenv("LVM_SUPPRESS_FD_WARNINGS", "1", 1);
 	if (!tp)
 	    execlp("lvcreate", "lvcreate", "-L", sz, vg, "-n", lv, (char *)NULL);
 	else
@@ -256,6 +257,7 @@ int lvm_snapshot(const char *orig, const char *path, uint64_t size)
 		return -1;
 	}
 
+	(void)setenv("LVM_SUPPRESS_FD_WARNINGS", "1", 1);
 	if (!ret) {
 		ret = execlp("lvcreate", "lvcreate", "-s", "-L", sz, "-n", lv, orig, (char *)NULL);
 	} else {
@@ -356,6 +358,7 @@ int lvm_destroy(struct bdev *orig)
 	if ((pid = fork()) < 0)
 		return -1;
 	if (!pid) {
+		(void)setenv("LVM_SUPPRESS_FD_WARNINGS", "1", 1);
 		execlp("lvremove", "lvremove", "-f", orig->src, (char *)NULL);
 		exit(EXIT_FAILURE);
 	}