feat: finalize deployment during first check (#277)

zhaohuiw42 · web-flow · commit 7c0510e03cc8 · 2025-12-30T16:27:53.000+08:00
Move osTreeFinalize into the first-check success path so finalize happens before a potential reboot prior to login. Task: https://pms.uniontech.com/task-view-385219.html
diff --git a/src/lastore-daemon/manager_check.go b/src/lastore-daemon/manager_check.go
@@ -144,10 +144,12 @@ func (m *Manager) checkUpgrade(sender dbus.Sender, checkMode system.UpdateType,
 				if err != nil {
 					logger.Warning(err)
 				}
-			case secondCheck:
+				// Doing finalize after first check is done, because user may choose to reboot again
+				// before login.
 				if err = m.immutableManager.osTreeFinalize(); err != nil {
 					logger.Warning(err)
 				}
+			case secondCheck:
 				// ps: 登录后检查无异常，去掉第二次检查，上报更新成功，更新baseline信息，还原grub配置
 				err = m.delRebootCheckOption(secondCheck)
 				if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -144,10 +144,12 @@ func (m *Manager) checkUpgrade(sender dbus.Sender, checkMode system.UpdateType,`
`144`	`144`	`if err != nil {`
`145`	`145`	`logger.Warning(err)`
`146`	`146`	`}`
`147`		`- case secondCheck:`
	`147`	`+ // Doing finalize after first check is done, because user may choose to reboot again`
	`148`	`+ // before login.`
`148`	`149`	`if err = m.immutableManager.osTreeFinalize(); err != nil {`
`149`	`150`	`logger.Warning(err)`
`150`	`151`	`}`
	`152`	`+ case secondCheck:`
`151`	`153`	`// ps: 登录后检查无异常，去掉第二次检查，上报更新成功，更新baseline信息，还原grub配置`
`152`	`154`	`err = m.delRebootCheckOption(secondCheck)`
`153`	`155`	`if err != nil {`