diff --git a/SOURCES/rear-bz2061521.patch b/SOURCES/rear-bz2061521.patch new file mode 100644 index 0000000..e6a0030 --- /dev/null +++ b/SOURCES/rear-bz2061521.patch @@ -0,0 +1,19 @@ +diff --git a/usr/share/rear/lib/layout-functions.sh b/usr/share/rear/lib/layout-functions.sh +index 69f80ed7..4c0df9bd 100644 +--- a/usr/share/rear/lib/layout-functions.sh ++++ b/usr/share/rear/lib/layout-functions.sh +@@ -335,11 +335,9 @@ find_disk() { + } + + find_disk_and_multipath() { +- res=$(find_disk "$1" ${2+"$2"}) +- if [[ -n "$res" || "$AUTOEXCLUDE_MULTIPATH" =~ ^[yY1] ]]; then +- echo $res +- else +- find_multipath "$1" ${2+"$2"} ++ find_disk "$1" ${2+"$2"} ++ if ! is_true "$AUTOEXCLUDE_MULTIPATH" ; then ++ find_multipath "$1" + fi + } + diff --git a/SPECS/rear.spec b/SPECS/rear.spec index 135ae08..6e0f702 100644 --- a/SPECS/rear.spec +++ b/SPECS/rear.spec @@ -2,7 +2,7 @@ Summary: Relax-and-Recover is a Linux disaster recovery and system migration tool Name: rear Version: 2.4 -Release: 15%{?dist} +Release: 16%{?dist} License: GPLv3 Group: Applications/File URL: http://relax-and-recover.org/ @@ -35,6 +35,7 @@ Patch33: rear-bz1930662.patch Patch35: rear-bz1983013.patch Patch38: rear-bz1983000.patch Patch39: rear-pr2675.patch +Patch42: rear-bz2061521.patch ExcludeArch: s390x ExcludeArch: s390 @@ -153,6 +154,7 @@ fi %patch35 -p1 %patch38 -p1 %patch39 -p1 +%patch42 -p1 echo "30 1 * * * root /usr/sbin/rear checklayout || /usr/sbin/rear mkrescue" >rear.cron @@ -187,6 +189,9 @@ TZ=UTC %{__make} -C doc %{_sbindir}/rear %changelog +* Tue Apr 26 2022 Pavel Cahyna - 2.4-16 +- Apply upstream PR2237 to include multipath disks in backup + * Thu Dec 16 2021 Pavel Cahyna - 2.4-15 - Backport PR2608: Fix setting boot path in case of UEFI partition (ESP) on MD RAID