From: S.Çağlar Onur <caglar@10ur.org>
Date: Tue, 30 Apr 2013 18:55:03 +0000 (-0400)
Subject: silence "sh: 1: zfs: not found" errors on systems without ZFS
X-Git-Tag: lxc-1.0.0.alpha1~1^2~248
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fc0d057c34f3ee10eeb87e3f11405aa79c3b4df;p=thirdparty%2Flxc.git

silence "sh: 1: zfs: not found" errors on systems without ZFS

Signed-off-by: S.Çağlar Onur <caglar@10ur.org>
Signed-off-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/bdev.c b/src/lxc/bdev.c
index a3577a207..1de302f17 100644
--- a/src/lxc/bdev.c
+++ b/src/lxc/bdev.c
@@ -440,7 +440,7 @@ static int zfs_list_entry(const char *path, char *output)
 	FILE *f;
 	int found=0;
 
-	if ((f = popen("zfs list", "r")) == NULL) {
+	if ((f = popen("zfs list 2> /dev/null", "r")) == NULL) {
 		SYSERROR("popen failed");
 		return 0;
 	}