The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/7170
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
From 0933af7060e2b45b350ee9d73b2f04e4b45436cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com>
Date: Fri, 10 Apr 2020 14:54:29 -0400
Subject: [PATCH] lxd/daemon: Ignore .zfs in volumes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
---
lxd/daemon_storage.go | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/lxd/daemon_storage.go b/lxd/daemon_storage.go
index 3f4d5118d8..74a9671812 100644
--- a/lxd/daemon_storage.go
+++ b/lxd/daemon_storage.go
@@ -144,10 +144,16 @@ func daemonStorageValidate(s *state.State, target string)
error {
for _, entry := range entries {
entryName := entry.Name()
+ // Don't fail on clean ext4 volumes.
if entryName == "lost+found" {
continue
}
+ // Don't fail on systems with snapdir=visible.
+ if entryName == ".zfs" {
+ continue
+ }
+
return fmt.Errorf("Storage volume %q isn't empty", target)
}
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
