github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Update ZFS for unsupported warnings

Browse Source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2018-10-26 13:52:32 -04:00
parent 16aaf6c065
commit 1301813f7a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vendor.conf
View File

@ -81,7 +81,7 @@ k8s.io/kubernetes v1.12.0
k8s.io/utils cd34563cd63c2bd7c6fe88a73c4dcf34ed8a67cb k8s.io/utils cd34563cd63c2bd7c6fe88a73c4dcf34ed8a67cb
# zfs dependencies # zfs dependencies
github.com/containerd/zfs 9a0b8b8b5982014b729cd34eb7cd7a11062aa6ec github.com/containerd/zfs 9f6ef3b1fe5144bd91fe5855b4eba81bc0d17d03
github.com/mistifyio/go-zfs 166add352731e515512690329794ee593f1aaff2 github.com/mistifyio/go-zfs 166add352731e515512690329794ee593f1aaff2
github.com/pborman/uuid c65b2f87fee37d1c7854c9164a450713c28d50cd github.com/pborman/uuid c65b2f87fee37d1c7854c9164a450713c28d50cd

2
vendor/github.com/containerd/zfs/zfs.go generated vendored
View File

@ -50,7 +50,7 @@ func NewSnapshotter(root string) (snapshots.Snapshotter, error) {
return nil, err return nil, err
} }
if m.FSType != "zfs" { if m.FSType != "zfs" {
return nil, errors.Errorf("path %s must be a zfs filesystem to be used with the zfs snapshotter", root) return nil, errors.Wrapf(plugin.ErrSkipPlugin, "path %s must be a zfs filesystem to be used with the zfs snapshotter", root)
} }
dataset, err := zfs.GetDataset(m.Source) dataset, err := zfs.GetDataset(m.Source)
if err != nil { if err != nil {