Skip to content

Commit 52f922e

Browse files
committed
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
1 parent 5a17dd3 commit 52f922e

2 files changed

Lines changed: 1 addition & 23 deletions

File tree

src/lastore-daemon/manager.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"github.com/godbus/dbus/v5"
2424
"github.com/linuxdeepin/dde-api/polkit"
2525
ConfigManager "github.com/linuxdeepin/go-dbus-factory/org.desktopspec.ConfigManager"
26-
abrecovery "github.com/linuxdeepin/go-dbus-factory/system/com.deepin.abrecovery"
2726
accounts "github.com/linuxdeepin/go-dbus-factory/system/org.deepin.dde.accounts1"
2827
power "github.com/linuxdeepin/go-dbus-factory/system/org.deepin.dde.power1"
2928
ofdbus "github.com/linuxdeepin/go-dbus-factory/system/org.freedesktop.dbus"
@@ -92,7 +91,6 @@ type Manager struct {
9291
loginManager login1.Manager
9392
sysDBusDaemon ofdbus.DBus
9493
systemd systemd1.Manager
95-
abObj abrecovery.ABRecovery
9694

9795
grub *grubManager
9896
userAgents *userAgentMap // 闲时退出时,需要保存数据,启动时需要根据uid,agent sender以及session path完成数据恢复
@@ -108,8 +106,7 @@ type Manager struct {
108106
checkDpkgCapabilityOnce sync.Once
109107
supportDpkgScriptIgnore bool
110108

111-
envIsValid bool
112-
preBackUpCheck bool
109+
envIsValid bool
113110

114111
logFds []*os.File
115112
logFdsMu sync.Mutex
@@ -140,11 +137,9 @@ func NewManager(service *dbusutil.Service, updateApi system.System, c *config.Co
140137
signalLoop: dbusutil.NewSignalLoop(service.Conn(), 10),
141138
systemd: systemd1.NewManager(service.Conn()),
142139
sysPower: power.NewPower(service.Conn()),
143-
abObj: abrecovery.NewABRecovery(service.Conn()),
144140
securitySourceConfig: make(UpdateSourceConfig),
145141
systemSourceConfig: make(UpdateSourceConfig),
146142
envIsValid: true,
147-
preBackUpCheck: true,
148143
}
149144
m.reloadOemConfig(true)
150145
m.signalLoop.Start()

src/lastore-daemon/manager_update.go

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -89,22 +89,6 @@ func (m *Manager) beforeUpdateSourceEnvCheck() bool {
8989
return flag
9090
}
9191

92-
func (m *Manager) preCheckBackUp() {
93-
canBackup, abErr := m.abObj.CanBackup(0)
94-
if abErr != nil || !canBackup {
95-
logger.Info("can not backup,", abErr)
96-
m.preBackUpCheck = false
97-
}
98-
hasBackedUp, err := m.abObj.HasBackedUp().Get(0)
99-
if err != nil && !hasBackedUp {
100-
abErr = m.abObj.StartBackup(0)
101-
if abErr != nil {
102-
logger.Info("can not backup,", abErr)
103-
m.preBackUpCheck = false
104-
}
105-
}
106-
}
107-
10892
// updateSource 检查更新主要步骤:1.从更新平台获取数据并解析;2.apt update;3.最终可更新内容确定(模拟安装的方式);4.数据上报;
10993
// 任务进度划分: 0-10%-80%-90%-100%
11094
func (m *Manager) updateSource(sender dbus.Sender) (*Job, error) {
@@ -135,7 +119,6 @@ func (m *Manager) updateSource(sender dbus.Sender) (*Job, error) {
135119
if err != nil {
136120
return nil, err
137121
}
138-
m.preCheckBackUp()
139122
prepareUpdateSource()
140123
m.reloadOemConfig(true)
141124
m.updatePlatform.Token = updateplatform.UpdateTokenConfigFile(m.config.IncludeDiskInfo, m.config.GetHardwareIdByHelper)

0 commit comments

Comments
 (0)