o/devicestate: correctly construct KernelBootInfo from model that is …

…being installed, not current device context
canonical · Feb 4, 2025 · 70a55cb · 70a55cb
1 parent d69103c
commit 70a55cb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/overlord/devicestate/devicestate_install_api_test.go b/overlord/devicestate/devicestate_install_api_test.go
@@ -423,7 +423,7 @@ func (s *deviceMgrInstallAPISuite) testInstallFinishStep(c *C, opts finishStepOp
 			Name:             "pc-kernel",
 			Revision:         snap.R(1),
 			MountPoint:       kernelMountDir,
-			IsCore:           false,
+			IsCore:           !opts.installClassic,
 			ModulesComps:     modulesComps,
 			NeedsDriversTree: true,
 		})

diff --git a/overlord/devicestate/handlers_install.go b/overlord/devicestate/handlers_install.go
@@ -1076,13 +1076,9 @@ func (m *DeviceManager) doInstallFinish(t *state.Task, _ *tomb.Tomb) error {
 
 	snapInfos := systemAndSnaps.InfosByType
 	snapSeeds := systemAndSnaps.SeedSnapsByType
-	deviceCtx, err := DeviceCtx(st, t, nil)
-	if err != nil {
-		return fmt.Errorf("cannot get device context: %v", err)
-	}
 
 	// Find out kernel-modules components in the seed
-	isCore := !deviceCtx.Classic()
+	isCore := !systemAndSnaps.Model.Classic()
 	kBootInfo := kBootInfo(systemAndSnaps, kernMntPoint, mntPtForComps, isCore)
 
 	logger.Debugf("writing content to partitions")