openkylin
/
yhkylin-backup-tools
mirror of https://gitee.com/openkylin/yhkylin-backup-tools.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

自动备份点还原后有问题

This commit is contained in:
zhaominyong 2022-07-28 18:49:35 +08:00
parent c59d2f3f4c
commit 71049c3e2b
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backup-daemon/data/backup-auto-efi
View File

@ -1038,7 +1038,7 @@ restoreAuto() { #还原
exit 7 #备份文件不存在，不能还原系统 exit 7 #备份文件不存在，不能还原系统
fi fi
if [ "$uuid" = "$auto_uuid" ]; then if [ "$uuid" = "{$auto_uuid}" ]; then
m_isRetainUserData=true m_isRetainUserData=true
fi fi

4
backup-daemon/mybackupmanager.cpp
View File

@ -332,6 +332,10 @@ void MyBackupManager::autoBackUpForSystemUpdate_noreturn(const QString& autoback
} }
backupWrapper.m_backupPaths << "/"; backupWrapper.m_backupPaths << "/";
backupWrapper.m_backupExcludePaths = Utils::getFromExcludePathsFile(); backupWrapper.m_backupExcludePaths = Utils::getFromExcludePathsFile();
backupWrapper.m_backupExcludePaths << "/home";
backupWrapper.m_backupExcludePaths << "/root";
backupWrapper.m_backupExcludePaths << "/data/home";
backupWrapper.m_backupExcludePaths << "/data/root";
backupWrapper.m_type = BackupType::BACKUP_SYSTEM; backupWrapper.m_type = BackupType::BACKUP_SYSTEM;
backupWrapper.m_iPosition = BackupPosition::LOCAL; backupWrapper.m_iPosition = BackupPosition::LOCAL;
backupWrapper.m_frontUserName = frontUserName; backupWrapper.m_frontUserName = frontUserName;

2
backup-daemon/parsebackuplist.cpp
View File

@ -299,7 +299,7 @@ void ParseBackupList::getCustomizePaths(QStringList &customizePaths)
QDomElement elePrefixPath = node.firstChildElement(PREFIXDESTPATH); QDomElement elePrefixPath = node.firstChildElement(PREFIXDESTPATH);
if (!elePrefixPath.isNull()) { if (!elePrefixPath.isNull()) {
customizePaths << elePrefixPath.text(); customizePaths << elePrefixPath.text() + BACKUP_SNAPSHOTS_PATH;
} }
} }
} }