From 8f77bc7bfc40fcb083960f4fc149a4966d5991b1 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 19 2017 13:24:25 +0000 Subject: import rear-2.00-3.el7_4 --- diff --git a/SOURCES/pr-1481.patch b/SOURCES/pr-1481.patch new file mode 100644 index 0000000..1438ff5 --- /dev/null +++ b/SOURCES/pr-1481.patch @@ -0,0 +1,27 @@ +diff --git a/usr/share/rear/prep/default/310_include_uefi_tools.sh b/usr/share/rear/prep/default/330_include_uefi_tools.sh +similarity index 58% +rename from usr/share/rear/prep/default/310_include_uefi_tools.sh +rename to usr/share/rear/prep/default/330_include_uefi_tools.sh +index 61f973a..c910d36 100644 +--- a/usr/share/rear/prep/default/310_include_uefi_tools.sh ++++ b/usr/share/rear/prep/default/330_include_uefi_tools.sh +@@ -1,14 +1,9 @@ +-# When /boot/efi is mounted we copy the UEFI binaries we might need ++# ++# Copy UEFI binaries we might need into the ReaR recovery system. ++# + +-# If noefi is set, we can ignore UEFI altogether +-if grep -qw 'noefi' /proc/cmdline; then +- return +-fi +- +-# next step, is checking /boot/efi directory (we need it) +-if [[ ! -d /boot/efi ]]; then +- return # must be mounted +-fi ++# Include UEFI tools on demand only ++is_true $USING_UEFI_BOOTLOADER || return + + REQUIRED_PROGS=( "${REQUIRED_PROGS[@]}" + dosfsck diff --git a/SPECS/rear.spec b/SPECS/rear.spec index d3fda5d..1746bee 100644 --- a/SPECS/rear.spec +++ b/SPECS/rear.spec @@ -2,13 +2,14 @@ Summary: Relax-and-Recover is a Linux disaster recovery and system migration tool Name: rear Version: 2.00 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3 Group: Applications/File URL: http://relax-and-recover.org/ # as GitHub stopped with download section we need to go back to Sourceforge for downloads Source0: https://sourceforge.net/projects/rear/files/rear/2.00/%{version}/rear-%{version}.tar.gz +Patch0: pr-1481.patch #Patch0: 0001-Added-PRE-POST-backup-scripts-in-order-to-be-able-to.patch #Patch1: 0002-Solved-error-with-exit-tasks-on-PRE-POST-backup-scri.patch #Patch2: 0003-Added-some-explanation-of-PRE-POST-backup-scripts-in.patch @@ -94,7 +95,7 @@ fi %prep %setup -#%patch0 -p1 +%patch0 -p1 #%patch1 -p1 #%patch2 -p1 @@ -126,6 +127,10 @@ echo "30 1 * * * root /usr/sbin/rear checklayout || /usr/sbin/rear mkrescue" >re %{_sbindir}/rear %changelog +* Wed Sep 13 2017 Pavel Cahyna - 2.00-3 +- Fix rear mkrescue on systems w/o UEFI. Upstream PR#1481 issue#1478 +- Resolves: #1479002 + * Wed May 17 2017 Jakub Mazanek - 2.00-2 - Excluding Archs s390 and s390x - Related #1355667