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中的项