Also use the builtin SanitizePlugsSlots for classic builds

canonical · Dec 5, 2023 · 4c1f71b · 4c1f71b
1 parent 9997df4
commit 4c1f71b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/internal/statemachine/classic_states.go b/internal/statemachine/classic_states.go
@@ -15,6 +15,7 @@ import (
 
 	"github.com/snapcore/snapd/image"
 	"github.com/snapcore/snapd/image/preseed"
+	"github.com/snapcore/snapd/interfaces/builtin"
 	"github.com/snapcore/snapd/osutil"
 	"github.com/snapcore/snapd/seed/seedwriter"
 	"github.com/snapcore/snapd/snap"
@@ -726,8 +727,8 @@ func (stateMachine *StateMachine) prepareClassicImage() error {
 		imageOpts.Channel = stateMachine.commonFlags.Channel
 	}
 
-	// plug/slot sanitization not used by snap image.Prepare, make it no-op.
-	snap.SanitizePlugsSlots = func(snapInfo *snap.Info) {}
+	// plug/slot sanitization needed by provider handling
+	snap.SanitizePlugsSlots = builtin.SanitizePlugsSlots
 
 	// check if the rootfs is already preseeded. This can happen when building from a
 	// rootfs tarball