From 7e0424bd1a6652bb6126bb7c52747543194ab8e5 Mon Sep 17 00:00:00 2001 From: zhaominyong Date: Wed, 11 May 2022 14:29:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=8E=82=E8=BF=98=E5=8E=9F=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E6=B8=85=E7=90=86/home=E4=B8=8B=E7=9A=84=E6=AE=8B?= =?UTF-8?q?=E7=95=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backup-daemon/systemrestoreproxy.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/backup-daemon/systemrestoreproxy.cpp b/backup-daemon/systemrestoreproxy.cpp index 15dda56..243efbc 100755 --- a/backup-daemon/systemrestoreproxy.cpp +++ b/backup-daemon/systemrestoreproxy.cpp @@ -357,11 +357,11 @@ void SystemRestoreProxy::restoreSystem() fileIfSync.replace("//", "/"); QFileInfo file(fileIfSync); QDateTime beginTime = file.fileTime(QFileDevice::FileModificationTime); - if (Utils::isHuawei990() && FACTORY_BACKUP_UUID == m_curUuid && m_backupWrapper.m_type == BackupType::RESTORE_SYSTEM) { - // 出厂还原有的机器上删除/home/xxx有残留,故在此再强制删除一下,sudo rm -rf命令一遍还删除不了(报错:无法删除/home/xx/.config:目录非空,应该是删除后又自动生成了),多删除几次还不是非常干净,^_^ - removeHome(Utils::getSysRootPath() + "/home"); - removeHome(Utils::getSysRootPath() + "/data/home"); - } +// if (Utils::isHuawei990() && FACTORY_BACKUP_UUID == m_curUuid && m_backupWrapper.m_type == BackupType::RESTORE_SYSTEM) { +// // 出厂还原有的机器上删除/home/xxx有残留,故在此再强制删除一下,sudo rm -rf命令一遍还删除不了(报错:无法删除/home/xx/.config:目录非空,应该是删除后又自动生成了),多删除几次还不是非常干净,^_^ +// removeHome(Utils::getSysRootPath() + "/home"); +// removeHome(Utils::getSysRootPath() + "/data/home"); +// } Utils::wait(10); Utils::updateSyncFile(); while (1) {