From 55bf3c10f0f80d285f2385ff13d3ad86025353ab Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Thu, 4 May 2017 17:30:23 -0400 Subject: [PATCH] containerd: compile tags to exclude btrfs Leave in btrfs by default, but add go build tags to exclude it. `go build -tags containerd_no_btrfs` will leave that driver out. As the current containerd/btrfs code needs link to libbtrfs*.so, but not all distros provide it. Signed-off-by: Vincent Batts --- cmd/containerd/builtins_btrfs_linux.go | 5 +++++ cmd/containerd/builtins_linux.go | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 cmd/containerd/builtins_btrfs_linux.go diff --git a/cmd/containerd/builtins_btrfs_linux.go b/cmd/containerd/builtins_btrfs_linux.go new file mode 100644 index 000000000..f5aa91787 --- /dev/null +++ b/cmd/containerd/builtins_btrfs_linux.go @@ -0,0 +1,5 @@ +// +build !containerd_no_btrfs + +package main + +import _ "github.com/containerd/containerd/snapshot/btrfs" diff --git a/cmd/containerd/builtins_linux.go b/cmd/containerd/builtins_linux.go index fa26830c8..1116acc0c 100644 --- a/cmd/containerd/builtins_linux.go +++ b/cmd/containerd/builtins_linux.go @@ -3,6 +3,5 @@ package main import ( _ "github.com/containerd/containerd/linux" _ "github.com/containerd/containerd/metrics/cgroups" - _ "github.com/containerd/containerd/snapshot/btrfs" _ "github.com/containerd/containerd/snapshot/overlay" )