Fix pebble Containerd path (#874)

canonical · Dec 6, 2024 · a181d4c · a181d4c
1 parent 9536f34
commit a181d4c
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/src/k8s/pkg/snap/pebble.go b/src/k8s/pkg/snap/pebble.go
@@ -13,9 +13,10 @@ import (
 )
 
 type PebbleOpts struct {
-	SnapDir       string
-	SnapCommonDir string
-	RunCommand    func(ctx context.Context, command []string, opts ...func(c *exec.Cmd)) error
+	SnapDir           string
+	SnapCommonDir     string
+	RunCommand        func(ctx context.Context, command []string, opts ...func(c *exec.Cmd)) error
+	ContainerdBaseDir string
 }
 
 // pebble implements the Snap interface.
@@ -38,6 +39,15 @@ func NewPebble(opts PebbleOpts) *pebble {
 		},
 	}
 
+	containerdBaseDir := opts.ContainerdBaseDir
+	if containerdBaseDir == "" {
+		containerdBaseDir = "/"
+		if s.Strict() {
+			containerdBaseDir = opts.SnapCommonDir
+		}
+	}
+	s.containerdBaseDir = containerdBaseDir
+
 	return s
 }