From dfc544484e6dd92cce536d807c16010281251977 Mon Sep 17 00:00:00 2001 From: electricface Date: Thu, 22 Jan 2026 17:55:48 +0800 Subject: [PATCH] fix: Remove features related to the outdated backup and restore system "ab recovery" "ab recovery" has been superseded by the deepin-immutable system. Link: https://gerrit.uniontech.com/c/lastore-daemon/+/317933 --- src/lastore-daemon/manager.go | 7 +------ src/lastore-daemon/manager_update.go | 17 ----------------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/src/lastore-daemon/manager.go b/src/lastore-daemon/manager.go index 54b75c4d0..dc96d11ac 100644 --- a/src/lastore-daemon/manager.go +++ b/src/lastore-daemon/manager.go @@ -23,7 +23,6 @@ import ( "github.com/godbus/dbus/v5" "github.com/linuxdeepin/dde-api/polkit" ConfigManager "github.com/linuxdeepin/go-dbus-factory/org.desktopspec.ConfigManager" - abrecovery "github.com/linuxdeepin/go-dbus-factory/system/com.deepin.abrecovery" accounts "github.com/linuxdeepin/go-dbus-factory/system/org.deepin.dde.accounts1" power "github.com/linuxdeepin/go-dbus-factory/system/org.deepin.dde.power1" ofdbus "github.com/linuxdeepin/go-dbus-factory/system/org.freedesktop.dbus" @@ -92,7 +91,6 @@ type Manager struct { loginManager login1.Manager sysDBusDaemon ofdbus.DBus systemd systemd1.Manager - abObj abrecovery.ABRecovery grub *grubManager userAgents *userAgentMap // 闲时退出时,需要保存数据,启动时需要根据uid,agent sender以及session path完成数据恢复 @@ -108,8 +106,7 @@ type Manager struct { checkDpkgCapabilityOnce sync.Once supportDpkgScriptIgnore bool - envIsValid bool - preBackUpCheck bool + envIsValid bool logFds []*os.File logFdsMu sync.Mutex @@ -140,11 +137,9 @@ func NewManager(service *dbusutil.Service, updateApi system.System, c *config.Co signalLoop: dbusutil.NewSignalLoop(service.Conn(), 10), systemd: systemd1.NewManager(service.Conn()), sysPower: power.NewPower(service.Conn()), - abObj: abrecovery.NewABRecovery(service.Conn()), securitySourceConfig: make(UpdateSourceConfig), systemSourceConfig: make(UpdateSourceConfig), envIsValid: true, - preBackUpCheck: true, } m.reloadOemConfig(true) m.signalLoop.Start() diff --git a/src/lastore-daemon/manager_update.go b/src/lastore-daemon/manager_update.go index af018dee7..f8ddb1992 100644 --- a/src/lastore-daemon/manager_update.go +++ b/src/lastore-daemon/manager_update.go @@ -89,22 +89,6 @@ func (m *Manager) beforeUpdateSourceEnvCheck() bool { return flag } -func (m *Manager) preCheckBackUp() { - canBackup, abErr := m.abObj.CanBackup(0) - if abErr != nil || !canBackup { - logger.Info("can not backup,", abErr) - m.preBackUpCheck = false - } - hasBackedUp, err := m.abObj.HasBackedUp().Get(0) - if err != nil && !hasBackedUp { - abErr = m.abObj.StartBackup(0) - if abErr != nil { - logger.Info("can not backup,", abErr) - m.preBackUpCheck = false - } - } -} - // updateSource 检查更新主要步骤:1.从更新平台获取数据并解析;2.apt update;3.最终可更新内容确定(模拟安装的方式);4.数据上报; // 任务进度划分: 0-10%-80%-90%-100% func (m *Manager) updateSource(sender dbus.Sender) (*Job, error) { @@ -135,7 +119,6 @@ func (m *Manager) updateSource(sender dbus.Sender) (*Job, error) { if err != nil { return nil, err } - m.preCheckBackUp() prepareUpdateSource() m.reloadOemConfig(true) m.updatePlatform.Token = updateplatform.UpdateTokenConfigFile(m.config.IncludeDiskInfo, m.config.GetHardwareIdByHelper)