From 93e9082f245a227033261521267158e7bf0ad4ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=B0=91=E5=8B=87?= Date: Sun, 9 Oct 2022 16:50:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=9F=E7=94=A8=E6=88=B7=E4=BF=9D=E7=95=99?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE=E8=BF=98=E5=8E=9F=E6=97=B6?= =?UTF-8?q?=E5=86=8D=E5=B1=8F=E8=94=BD=E4=B8=80=E4=BA=9B=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backup-daemon/customizesystemrestoreproxy.cpp | 4 ++++ backup-daemon/data/backup-auto-efi | 3 ++- backup-daemon/systemrestoreproxy.cpp | 4 ++++ backup-daemon/udisksystemrestoreproxy.cpp | 4 ++++ 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/backup-daemon/customizesystemrestoreproxy.cpp b/backup-daemon/customizesystemrestoreproxy.cpp index 74c6bf7..97fcb00 100755 --- a/backup-daemon/customizesystemrestoreproxy.cpp +++ b/backup-daemon/customizesystemrestoreproxy.cpp @@ -244,6 +244,10 @@ QStringList CustomizeSystemRestoreProxy::getRsyncArgs(CustomizeSystemRestoreScen args << "--exclude=/etc/hedron"; args << "--exclude=/etc/kcm"; args << "--exclude=/usr/hedron/hedronagent"; + args << "--exclude=/etc/.kyinfo"; + args << "--exclude=/etc/LICENSE"; + args << "--exclude=/etc/ssl/certs"; + args << "--exclude=/usr/share/ca-certificates"; // 此处不要break，因为还需要排除SYSTEM_RESTORE中的项 diff --git a/backup-daemon/data/backup-auto-efi b/backup-daemon/data/backup-auto-efi index 13fc52c..a894d94 100755 --- a/backup-daemon/data/backup-auto-efi +++ b/backup-daemon/data/backup-auto-efi @@ -1101,7 +1101,8 @@ restoreAuto() { #还原 #下面是域用户相关信息，保留用户数据还原后不退域 excludes="${excludes} --exclude=/etc/sssd --exclude=/var/lib/sss --exclude=/usr/share/sssd --exclude=/etc/ipa --exclude=/etc/krb5.keytab" excludes="${excludes} --exclude=/etc/krb5.conf --exclude=/var/lib/ipa-client --exclude=/etc/nsswitch.conf --exclude=/etc/pam.d --exclude=/etc/hosts" - excludes="${excludes} --exclude=/etc/hedron --exclude=/etc/hedron --exclude=/etc/kcm --exclude=/usr/hedron/hedronagent" + excludes="${excludes} --exclude=/etc/hostname --exclude=/etc/hedron --exclude=/etc/kcm --exclude=/usr/hedron/hedronagent --exclude=/etc/.kyinfo --exclude=/etc/LICENSE" + excludes="${excludes} --exclude=/etc/ssl/certs --exclude=/usr/share/ca-certificates" #如果是990，排除/data；否则，排除/data/usershare if [ x${is_990_9a0} == x"true" ]; then diff --git a/backup-daemon/systemrestoreproxy.cpp b/backup-daemon/systemrestoreproxy.cpp index 3dab459..0d553be 100755 --- a/backup-daemon/systemrestoreproxy.cpp +++ b/backup-daemon/systemrestoreproxy.cpp @@ -259,6 +259,10 @@ QStringList SystemRestoreProxy::getRsyncArgs(SystemRestoreScene scene) args << "--exclude=/etc/hedron"; args << "--exclude=/etc/kcm"; args << "--exclude=/usr/hedron/hedronagent"; + args << "--exclude=/etc/.kyinfo"; + args << "--exclude=/etc/LICENSE"; + args << "--exclude=/etc/ssl/certs"; + args << "--exclude=/usr/share/ca-certificates"; // 此处不要break，因为还需要排除SYSTEM_RESTORE中的项 diff --git a/backup-daemon/udisksystemrestoreproxy.cpp b/backup-daemon/udisksystemrestoreproxy.cpp index cf32b78..b63c3e2 100755 --- a/backup-daemon/udisksystemrestoreproxy.cpp +++ b/backup-daemon/udisksystemrestoreproxy.cpp @@ -262,6 +262,10 @@ QStringList UDiskSystemRestoreProxy::getRsyncArgs(SystemRestoreScene scene) args << "--exclude=/etc/hedron"; args << "--exclude=/etc/kcm"; args << "--exclude=/usr/hedron/hedronagent"; + args << "--exclude=/etc/.kyinfo"; + args << "--exclude=/etc/LICENSE"; + args << "--exclude=/etc/ssl/certs"; + args << "--exclude=/usr/share/ca-certificates"; // 此处不要break，因为还需要排除SYSTEM_RESTORE中的项