From b96d705d961859d26ad6328627a9cb97f64844e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=B0=91=E5=8B=87?= <zhaominyong@kylinos.cn>
Date: Fri, 16 Sep 2022 17:45:53 +0800
Subject: [PATCH] =?UTF-8?q?140450=20=E3=80=90=E6=B7=B1=E5=9C=B3=E5=85=9A?=
 =?UTF-8?q?=E6=94=BFXC=E3=80=91=E5=9C=A8grup=E7=95=8C=E9=9D=A2=E8=BF=98?=
 =?UTF-8?q?=E5=8E=9F=E7=B3=BB=E7=BB=9F=E5=90=8E=EF=BC=8C=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E5=BC=80=E6=9C=BA=EF=BC=8C=E6=8F=90=E7=A4=BA=E6=97=A0=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=E8=AE=BE=E5=A4=87=E6=88=96=E8=80=85=E5=90=AF=E5=8A=A8?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5(=E5=BF=85=E7=8E=B0=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backup-daemon/data/backup-auto-efi | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/backup-daemon/data/backup-auto-efi b/backup-daemon/data/backup-auto-efi
index a3f4ef4..b04c007 100755
--- a/backup-daemon/data/backup-auto-efi
+++ b/backup-daemon/data/backup-auto-efi
@@ -1056,11 +1056,6 @@ restoreAuto() { #还原
     #额外排除目录或文件
     local excludes=
     if [ -d ${restoreDir}/data/efi ]; then
-        mkdir -p ${restoreDir}/data/boot/efi
-        mv -f ${restoreDir}/data/efi ${restoreDir}/data/boot/efi
-    fi
-    if [ -d ${restoreDir}/data/efi ]; then
-        mkdir -p ${rootpath}/boot
         rsync -avAXHr --no-inc-recursive --ignore-missing-args --delete ${restoreDir}/data/efi ${rootpath}/boot >/dev/null 2>>$PLOGFILE
         if [ $? -ne 0 -a $? -ne 24 -a $? -ne 23 ]; then
             echo "System restoring failed, please reboot your system!"
@@ -1068,7 +1063,6 @@ restoreAuto() { #还原
             exit 9
         fi
     elif [ -d ${restoreDir}/data/boot/efi ]; then
-        mkdir -p ${rootpath}/boot
         rsync -avAXHr --no-inc-recursive --ignore-missing-args --delete ${restoreDir}/data/boot/efi ${rootpath}/boot >/dev/null 2>>$PLOGFILE
         if [ $? -ne 0 -a $? -ne 24 -a $? -ne 23 ]; then
             echo "System restoring failed, please reboot your system!"