From: pgauret <pgauret@yahoo.com>
Date: Mon, 15 Apr 2019 07:18:42 +0000 (+0200)
Subject: storage: update zfs
X-Git-Tag: lxc-3.2.0~101^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b4925455cb734d5b61036e3c6868367c23700a7;p=thirdparty%2Flxc.git

storage: update zfs

Change zfs arguments. This also works with older zfs versions, tested with
zfs 0.7.9-3 on Ubuntu 18.10.

Closes #2916.

Signed-off-by: Paul Gauret <pgauret@yahoo.com>
[christian.brauner@ubuntu.com: adapt commit message and add Signed-off-by for Paul]
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/storage/zfs.c b/src/lxc/storage/zfs.c
index 0a804ad19..713884689 100644
--- a/src/lxc/storage/zfs.c
+++ b/src/lxc/storage/zfs.c
@@ -53,7 +53,7 @@ int zfs_detect_exec_wrapper(void *data)
 {
 	struct zfs_args *args = data;
 
-	execlp("zfs", "zfs", "get", "type", "-H", "-o", "name", args->dataset,
+	execlp("zfs", "zfs", "get", "-H", "-o", "name", "type", args->dataset,
 	       (char *)NULL);
 
 	return -1;