From 7fed05b792ced441bfdb854e9a72287cdca20a08 Mon Sep 17 00:00:00 2001
From: zhaominyong <zhaominyong@kylinos.cn>
Date: Fri, 11 Mar 2022 17:36:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=81=9C=E6=AD=A2=E5=AE=89=E5=85=A8=E5=8C=85?=
 =?UTF-8?q?=E5=90=AB=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backup-daemon/mybackupmanager.cpp          | 4 ++++
 backup-daemon/myprocess/calcbackupsize.cpp | 1 +
 backup-daemon/systemrestoreproxy.cpp       | 4 ++--
 backup-daemon/udisksystemrestoreproxy.cpp  | 4 ++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/backup-daemon/mybackupmanager.cpp b/backup-daemon/mybackupmanager.cpp
index e044d6c..1bf317a 100755
--- a/backup-daemon/mybackupmanager.cpp
+++ b/backup-daemon/mybackupmanager.cpp
@@ -500,6 +500,8 @@ void MyBackupManager::setKysecStatus(bool status)
             // 安全保护已开启
             m_bOpenKysec = true;
             Utils::setKysecStatus(false);
+            // 停止安全防护
+            QProcess::execute("systemctl stop kysec-init.service");
         } else {
             m_bOpenKysec = false;
         }
@@ -507,6 +509,8 @@ void MyBackupManager::setKysecStatus(bool status)
         if(Utils::isRunning("kysec-sync-daemon")){
             m_bStartKysecDeamon = true;
             Utils::setKysecDaemon(false);
+            // 停止安全防护
+            QProcess::execute("systemctl stop kysec-init.service");
         } else {
             m_bStartKysecDeamon = false;
         }
diff --git a/backup-daemon/myprocess/calcbackupsize.cpp b/backup-daemon/myprocess/calcbackupsize.cpp
index e0a6a9a..1fd5ea3 100755
--- a/backup-daemon/myprocess/calcbackupsize.cpp
+++ b/backup-daemon/myprocess/calcbackupsize.cpp
@@ -1,5 +1,6 @@
 #include "calcbackupsize.h"
 #include <QDebug>
+#include <QRegularExpression>
 
 CalcBackupSize::CalcBackupSize(QObject* parent) :
     QObject(parent),
diff --git a/backup-daemon/systemrestoreproxy.cpp b/backup-daemon/systemrestoreproxy.cpp
index 879922e..1ffd7cc 100755
--- a/backup-daemon/systemrestoreproxy.cpp
+++ b/backup-daemon/systemrestoreproxy.cpp
@@ -319,8 +319,8 @@ QStringList SystemRestoreProxy::getRsyncArgs(SystemRestoreScene scene)
  */
 void SystemRestoreProxy::restoreSystem()
 {
-    // 停止安全防护
-    QProcess::execute("systemctl stop kysec-init.service");
+    // 停止安全防护, 迁移到业务开始的锁定中去
+    // QProcess::execute("systemctl stop kysec-init.service");
 
     // 本地系统备份没有img挂载，故下面两个路径相等
     m_srcPath = m_backupPath;
diff --git a/backup-daemon/udisksystemrestoreproxy.cpp b/backup-daemon/udisksystemrestoreproxy.cpp
index d041ba9..f115d1f 100755
--- a/backup-daemon/udisksystemrestoreproxy.cpp
+++ b/backup-daemon/udisksystemrestoreproxy.cpp
@@ -358,8 +358,8 @@ bool UDiskSystemRestoreProxy::doPrepare()
  */
 void UDiskSystemRestoreProxy::restoreSystem()
 {
-    // 停止安全防护
-    QProcess::execute("systemctl stop kysec-init.service");
+    // 停止安全防护, 迁移到业务开始的锁定中去
+    // QProcess::execute("systemctl stop kysec-init.service");
 
     QString destPath = Utils::getSysRootPath();