From 98b0b2a7c6911e71345ef83770fd661092006274 Mon Sep 17 00:00:00 2001
From: Jian Zeng <anonymousknight96@gmail.com>
Date: Thu, 3 Sep 2020 19:58:05 +0800
Subject: [PATCH 1/2] feat: make native root_path configurable

Part of #4514

Signed-off-by: Jian Zeng <anonymousknight96@gmail.com>
---
 snapshots/native/plugin/plugin.go | 54 +++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 snapshots/native/plugin/plugin.go

diff --git a/snapshots/native/plugin/plugin.go b/snapshots/native/plugin/plugin.go
new file mode 100644
index 000000000..8544f3ba0
--- /dev/null
+++ b/snapshots/native/plugin/plugin.go
@@ -0,0 +1,54 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package plugin
+
+import (
+	"errors"
+
+	"github.com/containerd/containerd/platforms"
+	"github.com/containerd/containerd/plugin"
+	"github.com/containerd/containerd/snapshots/native"
+)
+
+// Config represents configuration for the native plugin.
+type Config struct {
+	// Root directory for the plugin
+	RootPath string `toml:"root_path"`
+}
+
+func init() {
+	plugin.Register(&plugin.Registration{
+		Type:   plugin.SnapshotPlugin,
+		ID:     "native",
+		Config: &Config{},
+		InitFn: func(ic *plugin.InitContext) (interface{}, error) {
+			ic.Meta.Platforms = append(ic.Meta.Platforms, platforms.DefaultSpec())
+
+			config, ok := ic.Config.(*Config)
+			if !ok {
+				return nil, errors.New("invalid native configuration")
+			}
+
+			root := ic.Root
+			if len(config.RootPath) != 0 {
+				root = config.RootPath
+			}
+
+			return native.NewSnapshotter(root)
+		},
+	})
+}

From c50ff694f013cac12651b813a285d2f32ce9f4cd Mon Sep 17 00:00:00 2001
From: Jian Zeng <anonymousknight96@gmail.com>
Date: Thu, 3 Sep 2020 19:58:31 +0800
Subject: [PATCH 2/2] refactor(native): separate init from implementation

Part of #4513

Signed-off-by: Jian Zeng <anonymousknight96@gmail.com>
---
 cmd/containerd/builtins_linux.go |  2 +-
 cmd/containerd/builtins_unix.go  |  2 +-
 snapshots/native/native.go       | 13 -------------
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/cmd/containerd/builtins_linux.go b/cmd/containerd/builtins_linux.go
index 59fe8de44..650514424 100644
--- a/cmd/containerd/builtins_linux.go
+++ b/cmd/containerd/builtins_linux.go
@@ -22,6 +22,6 @@ import (
 	_ "github.com/containerd/containerd/runtime/v1/linux"
 	_ "github.com/containerd/containerd/runtime/v2"
 	_ "github.com/containerd/containerd/runtime/v2/runc/options"
-	_ "github.com/containerd/containerd/snapshots/native"
+	_ "github.com/containerd/containerd/snapshots/native/plugin"
 	_ "github.com/containerd/containerd/snapshots/overlay/plugin"
 )
diff --git a/cmd/containerd/builtins_unix.go b/cmd/containerd/builtins_unix.go
index d593166ca..143b24976 100644
--- a/cmd/containerd/builtins_unix.go
+++ b/cmd/containerd/builtins_unix.go
@@ -19,5 +19,5 @@
 package main
 
 import (
-	_ "github.com/containerd/containerd/snapshots/native"
+	_ "github.com/containerd/containerd/snapshots/native/plugin"
 )
diff --git a/snapshots/native/native.go b/snapshots/native/native.go
index 50d87577c..ba3a40e10 100644
--- a/snapshots/native/native.go
+++ b/snapshots/native/native.go
@@ -24,8 +24,6 @@ import (
 
 	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/mount"
-	"github.com/containerd/containerd/platforms"
-	"github.com/containerd/containerd/plugin"
 	"github.com/containerd/containerd/snapshots"
 	"github.com/containerd/containerd/snapshots/storage"
 
@@ -33,17 +31,6 @@ import (
 	"github.com/pkg/errors"
 )
 
-func init() {
-	plugin.Register(&plugin.Registration{
-		Type: plugin.SnapshotPlugin,
-		ID:   "native",
-		InitFn: func(ic *plugin.InitContext) (interface{}, error) {
-			ic.Meta.Platforms = append(ic.Meta.Platforms, platforms.DefaultSpec())
-			return NewSnapshotter(ic.Root)
-		},
-	})
-}
-
 type snapshotter struct {
 	root string
 	ms   *storage.MetaStore