From 229f7b3d6e1e93eaecd8928e2c4ce0c099e217be 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 18:45:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=BA=9B=E8=B7=AF?= =?UTF-8?q?=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backup-daemon/customizesystemrestoreproxy.cpp | 1 + backup-daemon/data/backup-auto-efi | 2 +- backup-daemon/systemrestoreproxy.cpp | 1 + backup-daemon/udisksystemrestoreproxy.cpp | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/backup-daemon/customizesystemrestoreproxy.cpp b/backup-daemon/customizesystemrestoreproxy.cpp index 97fcb00..38c8d1f 100755 --- a/backup-daemon/customizesystemrestoreproxy.cpp +++ b/backup-daemon/customizesystemrestoreproxy.cpp @@ -248,6 +248,7 @@ QStringList CustomizeSystemRestoreProxy::getRsyncArgs(CustomizeSystemRestoreScen args << "--exclude=/etc/LICENSE"; args << "--exclude=/etc/ssl/certs"; args << "--exclude=/usr/share/ca-certificates"; + args << "--exclude=/etc/NetworkManager"; // 此处不要break，因为还需要排除SYSTEM_RESTORE中的项 diff --git a/backup-daemon/data/backup-auto-efi b/backup-daemon/data/backup-auto-efi index a894d94..9705c10 100755 --- a/backup-daemon/data/backup-auto-efi +++ b/backup-daemon/data/backup-auto-efi @@ -1102,7 +1102,7 @@ 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/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" + excludes="${excludes} --exclude=/etc/ssl/certs --exclude=/usr/share/ca-certificates --exclude=/etc/NetworkManager" #如果是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 0d553be..2b8c789 100755 --- a/backup-daemon/systemrestoreproxy.cpp +++ b/backup-daemon/systemrestoreproxy.cpp @@ -263,6 +263,7 @@ QStringList SystemRestoreProxy::getRsyncArgs(SystemRestoreScene scene) args << "--exclude=/etc/LICENSE"; args << "--exclude=/etc/ssl/certs"; args << "--exclude=/usr/share/ca-certificates"; + args << "--exclude=/etc/NetworkManager"; // 此处不要break，因为还需要排除SYSTEM_RESTORE中的项 diff --git a/backup-daemon/udisksystemrestoreproxy.cpp b/backup-daemon/udisksystemrestoreproxy.cpp index b63c3e2..1f2486c 100755 --- a/backup-daemon/udisksystemrestoreproxy.cpp +++ b/backup-daemon/udisksystemrestoreproxy.cpp @@ -266,6 +266,7 @@ QStringList UDiskSystemRestoreProxy::getRsyncArgs(SystemRestoreScene scene) args << "--exclude=/etc/LICENSE"; args << "--exclude=/etc/ssl/certs"; args << "--exclude=/usr/share/ca-certificates"; + args << "--exclude=/etc/NetworkManager"; // 此处不要break，因为还需要排除SYSTEM_RESTORE中的项