[lxc-devel] [lxd/master] init: Ignore ZFS if in a container

[stgraber on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 354 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20161009/405ce54c/attachment.bin>
-------------- next part --------------
From 9506ceeb3578093bcc4c7e44081b58e413b5fc47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sat, 8 Oct 2016 21:26:17 -0400
Subject: [PATCH] init: Ignore ZFS if in a container
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 lxd/main.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lxd/main.go b/lxd/main.go
index 1f9b170..8a70c98 100644
--- a/lxd/main.go
+++ b/lxd/main.go
@@ -620,7 +620,7 @@ func cmdInit() error {
 
 	// Detect zfs
 	out, err := exec.LookPath("zfs")
-	if err == nil && len(out) != 0 {
+	if err == nil && len(out) != 0 && !runningInUserns {
 		backendsAvailable = append(backendsAvailable, "zfs")
 	}