many: move BuildKernelBootInfo to overlord/install package

Author: alfonsosanchezbeato

cmd/snap-bootstrap/cmd_initramfs_mounts.go

@@ -353,7 +353,7 @@ func doInstall(mst *initramfsMountsState, model *asserts.Model, sysSnaps map[sna
 
 	kernelSeed := sysSnaps[snap.TypeKernel]
 	kernCompsMntPts := make(map[string]string)
-	compSeedInfos := []gadgetInstall.CompSeedInfo{}
+	compSeedInfos := []install.CompSeedInfo{}
 	for _, sc := range kernelSeed.Components {
 		seedComp := sc
 		comp, ok := kernCompsByName[seedComp.CompSideInfo.Component.ComponentName]
@@ -388,7 +388,7 @@ func doInstall(mst *initramfsMountsState, model *asserts.Model, sysSnaps map[sna
 		if err != nil {
 			return err
 		}
-		compSeedInfos = append(compSeedInfos, gadgetInstall.CompSeedInfo{
+		compSeedInfos = append(compSeedInfos, install.CompSeedInfo{
 			CompInfo: compInfo,
 			CompSeed: &seedComp,
 		})
@@ -407,7 +407,7 @@ func doInstall(mst *initramfsMountsState, model *asserts.Model, sysSnaps map[sna
 	needsKernelSetup := kernel.NeedsKernelDriversTree(model) && !preseed
 
 	isCore := !model.Classic()
-	kernelBootInfo := gadgetInstall.BuildKernelBootInfo(
+	kernelBootInfo := install.BuildKernelBootInfo(
 		kernelSnap, compSeedInfos, kernelMountDir, kernCompsMntPts,
 		isCore, needsKernelSetup)
 

gadget/install/kernel.go

@@ -20,8 +20,6 @@
 package install
 
 import (
-	"github.com/snapcore/snapd/boot"
-	"github.com/snapcore/snapd/seed"
 	"github.com/snapcore/snapd/snap"
 )
 
@@ -51,52 +49,3 @@ type KernelModulesComponentInfo struct {
 	// MountPoint is the root of the files from the component
 	MountPoint string
 }
-
-// CompSeedInfo contains information for a component from the seed and
-// from its metadata.
-type CompSeedInfo struct {
-	CompInfo *snap.ComponentInfo
-	CompSeed *seed.Component
-}
-
-// KernelBootInfo contains information related to the kernel used on installation.
-type KernelBootInfo struct {
-	KSnapInfo     *KernelSnapInfo
-	BootableKMods []boot.BootableKModsComponents
-}
-
-// BuildKernelBootInfo constructs a KernelBootInfo.
-func BuildKernelBootInfo(kernInfo *snap.Info, compSeedInfos []CompSeedInfo, kernMntPoint string, mntPtForComps map[string]string, isCore, needsDriversTree bool) KernelBootInfo {
-	bootKMods := make([]boot.BootableKModsComponents, 0, len(compSeedInfos))
-	modulesComps := make([]KernelModulesComponentInfo, 0, len(compSeedInfos))
-	for _, compSeedInfo := range compSeedInfos {
-		ci := compSeedInfo.CompInfo
-		if ci.Type == snap.KernelModulesComponent {
-			cpi := snap.MinimalComponentContainerPlaceInfo(ci.Component.ComponentName,
-				ci.Revision, kernInfo.SnapName())
-			modulesComps = append(modulesComps, KernelModulesComponentInfo{
-				Name:       ci.Component.ComponentName,
-				Revision:   ci.Revision,
-				MountPoint: mntPtForComps[ci.FullName()],
-			})
-			bootKMods = append(bootKMods, boot.BootableKModsComponents{
-				CompPlaceInfo: cpi,
-				CompPath:      compSeedInfo.CompSeed.Path,
-			})
-		}
-	}
-
-	kSnapInfo := &KernelSnapInfo{
-		Name:             kernInfo.SnapName(),
-		Revision:         kernInfo.Revision,
-		MountPoint:       kernMntPoint,
-		IsCore:           isCore,
-		ModulesComps:     modulesComps,
-		NeedsDriversTree: needsDriversTree,
-	}
-
-	return KernelBootInfo{
-		KSnapInfo:     kSnapInfo,
-		BootableKMods: bootKMods,
-	}
-}

overlord/devicestate/devicemgr.go

@@ -37,7 +37,6 @@ import (
 	"github.com/snapcore/snapd/dirs"
 	"github.com/snapcore/snapd/gadget"
 	"github.com/snapcore/snapd/gadget/device"
-	gadgetInstall "github.com/snapcore/snapd/gadget/install"
 	"github.com/snapcore/snapd/i18n"
 	"github.com/snapcore/snapd/kernel/fde"
 	"github.com/snapcore/snapd/logger"
@@ -2249,7 +2248,7 @@ type systemAndEssentialSnaps struct {
 	*System
 	Seed            seed.Seed
 	InfosByType     map[snap.Type]*snap.Info
-	CompsByType     map[snap.Type][]gadgetInstall.CompSeedInfo
+	CompsByType     map[snap.Type][]install.CompSeedInfo
 	SeedSnapsByType map[snap.Type]*seed.Snap
 }
 
@@ -2306,7 +2305,7 @@ func (m *DeviceManager) loadSystemAndEssentialSnaps(wantedSystemLabel string, ty
 	// like "snapd" will be skipped and not part of the EssentialSnaps list
 	//
 	snapInfos := make(map[snap.Type]*snap.Info)
-	compInfos := make(map[snap.Type][]gadgetInstall.CompSeedInfo)
+	compInfos := make(map[snap.Type][]install.CompSeedInfo)
 	seedSnaps := make(map[snap.Type]*seed.Snap)
 	for _, seedSnap := range s.EssentialSnaps() {
 		typ := seedSnap.EssentialType
@@ -2330,9 +2329,9 @@ func (m *DeviceManager) loadSystemAndEssentialSnaps(wantedSystemLabel string, ty
 			return nil, fmt.Errorf("internal error while retrieving %s for %s mode: %v",
 				seedSnap.SnapName(), modeForComps, err)
 		}
-		var compInfosForType []gadgetInstall.CompSeedInfo
+		var compInfosForType []install.CompSeedInfo
 		if len(snapForMode.Components) > 0 {
-			compInfosForType = make([]gadgetInstall.CompSeedInfo, 0, len(snapForMode.Components))
+			compInfosForType = make([]install.CompSeedInfo, 0, len(snapForMode.Components))
 			for _, sc := range snapForMode.Components {
 				seedComp := sc
 				compf, err := snapfile.Open(seedComp.Path)
@@ -2344,7 +2343,7 @@ func (m *DeviceManager) loadSystemAndEssentialSnaps(wantedSystemLabel string, ty
 				if err != nil {
 					return nil, err
 				}
-				compInfosForType = append(compInfosForType, gadgetInstall.CompSeedInfo{
+				compInfosForType = append(compInfosForType, install.CompSeedInfo{
 					CompInfo: compInfo,
 					CompSeed: &seedComp,
 				})

overlord/devicestate/handlers_install.go

@@ -964,10 +964,10 @@ func (m *DeviceManager) loadAndMountSystemLabelSnaps(systemLabel string, essenti
 	return systemAndSnaps, mntPtForType, mntPtForComp, unmount, nil
 }
 
-func kBootInfo(systemAndSnaps *systemAndEssentialSnaps, kernMntPoint string, mntPtForComps map[string]string, isCore bool) install.KernelBootInfo {
+func kBootInfo(systemAndSnaps *systemAndEssentialSnaps, kernMntPoint string, mntPtForComps map[string]string, isCore bool) installLogic.KernelBootInfo {
 	kernInfo := systemAndSnaps.InfosByType[snap.TypeKernel]
 	compSeedInfos := systemAndSnaps.CompsByType[snap.TypeKernel]
-	return install.BuildKernelBootInfo(kernInfo, compSeedInfos, kernMntPoint,
+	return installLogic.BuildKernelBootInfo(kernInfo, compSeedInfos, kernMntPoint,
 		mntPtForComps, isCore, kernel.NeedsKernelDriversTree(systemAndSnaps.Model))
 }
 

overlord/install/install.go

@@ -38,6 +38,7 @@ import (
 	"github.com/snapcore/snapd/dirs"
 	"github.com/snapcore/snapd/gadget"
 	"github.com/snapcore/snapd/gadget/device"
+	gadgetInstall "github.com/snapcore/snapd/gadget/install"
 	"github.com/snapcore/snapd/kernel/fde"
 	"github.com/snapcore/snapd/logger"
 	"github.com/snapcore/snapd/osutil"
@@ -81,13 +82,62 @@ type EncryptionSupportInfo struct {
 	UnavailableWarning string
 }
 
+// CompSeedInfo contains information for a component from the seed and
+// from its metadata.
+type CompSeedInfo struct {
+	CompInfo *snap.ComponentInfo
+	CompSeed *seed.Component
+}
+
+// KernelBootInfo contains information related to the kernel used on installation.
+type KernelBootInfo struct {
+	KSnapInfo     *gadgetInstall.KernelSnapInfo
+	BootableKMods []boot.BootableKModsComponents
+}
+
 var (
 	timeNow = time.Now
 
 	secbootCheckTPMKeySealingSupported = secboot.CheckTPMKeySealingSupported
 	sysconfigConfigureTargetSystem     = sysconfig.ConfigureTargetSystem
 )
 
+// BuildKernelBootInfo constructs a KernelBootInfo.
+func BuildKernelBootInfo(kernInfo *snap.Info, compSeedInfos []CompSeedInfo, kernMntPoint string, mntPtForComps map[string]string, isCore, needsDriversTree bool) KernelBootInfo {
+	bootKMods := make([]boot.BootableKModsComponents, 0, len(compSeedInfos))
+	modulesComps := make([]gadgetInstall.KernelModulesComponentInfo, 0, len(compSeedInfos))
+	for _, compSeedInfo := range compSeedInfos {
+		ci := compSeedInfo.CompInfo
+		if ci.Type == snap.KernelModulesComponent {
+			cpi := snap.MinimalComponentContainerPlaceInfo(ci.Component.ComponentName,
+				ci.Revision, kernInfo.SnapName())
+			modulesComps = append(modulesComps, gadgetInstall.KernelModulesComponentInfo{
+				Name:       ci.Component.ComponentName,
+				Revision:   ci.Revision,
+				MountPoint: mntPtForComps[ci.FullName()],
+			})
+			bootKMods = append(bootKMods, boot.BootableKModsComponents{
+				CompPlaceInfo: cpi,
+				CompPath:      compSeedInfo.CompSeed.Path,
+			})
+		}
+	}
+
+	kSnapInfo := &gadgetInstall.KernelSnapInfo{
+		Name:             kernInfo.SnapName(),
+		Revision:         kernInfo.Revision,
+		MountPoint:       kernMntPoint,
+		IsCore:           isCore,
+		ModulesComps:     modulesComps,
+		NeedsDriversTree: needsDriversTree,
+	}
+
+	return KernelBootInfo{
+		KSnapInfo:     kSnapInfo,
+		BootableKMods: bootKMods,
+	}
+}
+
 // MockSecbootCheckTPMKeySealingSupported mocks secboot.CheckTPMKeySealingSupported usage by the package for testing.
 func MockSecbootCheckTPMKeySealingSupported(f func(tpmMode secboot.TPMProvisionMode) error) (restore func()) {
 	old := secbootCheckTPMKeySealingSupported