diff --git a/0001-add-exit-after-the-backup-system-is-successful.patch b/0001-add-exit-after-the-backup-system-is-successful.patch new file mode 100644 index 0000000..a9b25f3 --- /dev/null +++ b/0001-add-exit-after-the-backup-system-is-successful.patch @@ -0,0 +1,24 @@ +From ad0d95ff21f851ea5d3ec06d2d18ca0c760361c4 Mon Sep 17 00:00:00 2001 +From: leeffo +Date: Thu, 25 Aug 2022 15:02:55 +0800 +Subject: [PATCH] add exit after the backup system is successful + +--- + cui/main.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/cui/main.cpp b/cui/main.cpp +index b3c55be..1fb80a1 100644 +--- a/cui/main.cpp ++++ b/cui/main.cpp +@@ -285,6 +285,7 @@ void cmdBackupSys() { + } else { + cout << "backup successful, snapshot: " << snapID << endl; + } ++ exit(EXIT_SUCCESS); + } + + void cmdBackupData() { +-- +2.20.1 + diff --git a/0002-modify-grub.cfg-path.patch b/0002-modify-grub.cfg-path.patch new file mode 100644 index 0000000..9e04bc5 --- /dev/null +++ b/0002-modify-grub.cfg-path.patch @@ -0,0 +1,61 @@ +From a89380cdc9fc804fe3b2389a4e399111a5cf51da Mon Sep 17 00:00:00 2001 +From: leeffo +Date: Thu, 25 Aug 2022 16:04:02 +0800 +Subject: [PATCH] modify grub.cfg path + +--- + grub2/50_ubackup | 4 ++-- + grub2/ubackuplib.sh | 8 ++++---- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/grub2/50_ubackup b/grub2/50_ubackup +index 73a940c..8207eee 100644 +--- a/grub2/50_ubackup ++++ b/grub2/50_ubackup +@@ -530,8 +530,8 @@ while [ "x$list" != "x" ] ; do + "${GRUB_CMDLINE_LINUX} BACKUPID=$id ${GRUB_CMDLINE_LINUX_DEFAULT}" + done + if [ -d /etc/ubackup ] ;then +- if [ -d /sys/firmware/efi/ -a -f /boot/efi/EFI/UnionTech/grub.cfg ] ;then +- cat /boot/efi/EFI/UnionTech/grub.cfg |grep -B 2000 '### END /etc/grub.d/01_users ###' > /etc/ubackup/grub2/grub2_only_one.cfg ++ if [ -d /sys/firmware/efi/ -a -f /boot/efi/EFI/openEuler/grub.cfg ] ;then ++ cat /boot/efi/EFI/openEuler/grub.cfg |grep -B 2000 '### END /etc/grub.d/01_users ###' > /etc/ubackup/grub2/grub2_only_one.cfg + fi + + if [ -f /boot/grub2/grub.cfg ] ;then +diff --git a/grub2/ubackuplib.sh b/grub2/ubackuplib.sh +index e102352..b0af7d6 100644 +--- a/grub2/ubackuplib.sh ++++ b/grub2/ubackuplib.sh +@@ -112,8 +112,8 @@ function umount_point() { + + function update_grub2_menu() { + if [ -d /sys/firmware/efi/ ] ; then +- grub2-mkconfig > /boot/efi/EFI/UnionTech/grub.cfg +- cp -f /boot/efi/EFI/UnionTech/grub.cfg /etc/ubackup/grub2/org.cfg ++ grub2-mkconfig > /boot/efi/EFI/openEuler/grub.cfg ++ cp -f /boot/efi/EFI/openEuler/grub.cfg /etc/ubackup/grub2/org.cfg + else + grub2-mkconfig > /boot/grub2/grub.cfg + cp -f /boot/grub2/grub.cfg /etc/ubackup/grub2/org.cfg +@@ -131,7 +131,7 @@ function update_change_grub2_entry() { + fi + sed -i "s/BACKUPID=.*$/BACKUPID=$backupid/g" /etc/ubackup/grub2/grub2_only_one.cfg + if [ -d /sys/firmware/efi/ ] ; then +- cp -f /etc/ubackup/grub2/grub2_only_one.cfg /boot/efi/EFI/UnionTech/grub.cfg ++ cp -f /etc/ubackup/grub2/grub2_only_one.cfg /boot/efi/EFI/openEuler/grub.cfg + else + cp -f /etc/ubackup/grub2/grub2_only_one.cfg /boot/grub2/grub.cfg + fi +@@ -140,7 +140,7 @@ function update_change_grub2_entry() { + + function grub2_menu_restore() { + if [ -d /sys/firmware/efi/ ] ; then +- cp -f /etc/ubackup/grub2/org.cfg /boot/efi/EFI/UnionTech/grub.cfg ++ cp -f /etc/ubackup/grub2/org.cfg /boot/efi/EFI/openEuler/grub.cfg + else + cp -f /etc/ubackup/grub2/org.cfg /boot/grub2/grub.cfg + fi +-- +2.20.1 + diff --git a/ubackup.spec b/ubackup.spec index b4e17dc..62f63f1 100644 --- a/ubackup.spec +++ b/ubackup.spec @@ -1,7 +1,9 @@ Name: com.deepin.backup Version: 1.0 -Release: 0 +Release: 1 Source: %{name}-%{version}.tar.gz +Patch0: 0001-add-exit-after-the-backup-system-is-successful.patch +Patch1: 0002-modify-grub.cfg-path.patch BuildRequires: boost-devel BuildRequires: libtool @@ -34,7 +36,7 @@ Requires: %{name} = %{version}-%{release} This package provides a dracut module to build an initramfs %prep -%setup +%autosetup -p1 %build touch README @@ -95,6 +97,10 @@ install -p -m 0644 service/ubackup-restore.service %{buildroot}%{_sysconfdir}/ub %{_prefix}/lib/dracut/modules.d/99ubackup/module-setup.sh %changelog +* Thu Aug 25 2022 liweiganga - 1.0-1 +- feat: add exit after successful backup system +- feat: modify restore path + * Tue Aug 31 2021 heyitao - 1.0-0 - Add grub2 function for backup-restore tools