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

Merge pull request #9601 from kiashok/cimfsInitFix

Browse Source 
Fix CimFS plugin init error
This commit is contained in:
Fu Wei 2024-01-04 02:18:14 +00:00 committed by GitHub
commit 287b4cec9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diff/windows/cimfs.go
View File

@ -51,7 +51,7 @@ func init() {
} }
if !cimfs.IsCimFSSupported() { if !cimfs.IsCimFSSupported() {
return nil, fmt.Errorf("host windows version doesn't support CimFS") return nil, fmt.Errorf("host windows version doesn't support CimFS: %w", plugin.ErrSkipPlugin)
} }
ic.Meta.Platforms = append(ic.Meta.Platforms, platforms.DefaultSpec()) ic.Meta.Platforms = append(ic.Meta.Platforms, platforms.DefaultSpec())
return NewCimDiff(md.(*metadata.DB).ContentStore()) return NewCimDiff(md.(*metadata.DB).ContentStore())

2
snapshots/windows/cimfs.go
View File

@ -70,7 +70,7 @@ func init() {
// NewCimFSSnapshotter returns a new CimFS based windows snapshotter // NewCimFSSnapshotter returns a new CimFS based windows snapshotter
func NewCimFSSnapshotter(root string) (snapshots.Snapshotter, error) { func NewCimFSSnapshotter(root string) (snapshots.Snapshotter, error) {
if !cimfs.IsCimFSSupported() { if !cimfs.IsCimFSSupported() {
return nil, fmt.Errorf("host windows version doesn't support CimFS") return nil, fmt.Errorf("host windows version doesn't support CimFS: %w", plugin.ErrSkipPlugin)
} }
baseSn, err := newBaseSnapshotter(root) baseSn, err := newBaseSnapshotter(root)