rpms/rear
5
0
Fork 0
Code Issues Pull Requests Releases Activity

import rear-2.4-10.el8

Browse Source
This commit is contained in:
CentOS Sources 2019-11-05 14:42:17 -05:00 committed by Andrew Lukoshko
parent 89f1c2e3bd
commit 22c47ad414
3 changed files with 51 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
SOURCES/rear-bz1655956.patch Normal file
View File

@ -0,0 +1,35 @@
diff --git a/usr/sbin/rear b/usr/sbin/rear
index a51f820c..e21156bf 100755
--- a/usr/sbin/rear
+++ b/usr/sbin/rear
@@ -527,6 +527,10 @@ Build date: $( date -R )
if test "$WORKFLOW" != "help" ; then
# Create temporary work area and register removal exit task:
BUILD_DIR="$( mktemp -d -t rear.XXXXXXXXXXXXXXX || Error "Could not create build area '$BUILD_DIR'" )"
+ # Since 'mktemp' doesn't always return a path under /tmp, the build
+ # directory has always to be excluded for safety
+ BACKUP_PROG_EXCLUDE+=( "$BUILD_DIR" )
+
QuietAddExitTask cleanup_build_area_and_end_program
Log "Using build area '$BUILD_DIR'"
ROOTFS_DIR=$BUILD_DIR/rootfs
@@ -582,3 +586,5 @@ if test "$WORKFLOW" != "help" ; then
fi
exit $EXIT_CODE
+
+# vim: set et ts=4 sw=4:
diff --git a/usr/share/rear/conf/default.conf b/usr/share/rear/conf/default.conf
index ef118998..52b05eea 100644
--- a/usr/share/rear/conf/default.conf
+++ b/usr/share/rear/conf/default.conf
@@ -47,7 +47,9 @@
# is set in the environment where /usr/sbin/rear is called.
# To have a specific working area directory prefix for Relax-and-Recover
# specify in /etc/rear/local.conf something like
+#
# export TMPDIR="/prefix/for/rear/working/directory"
+#
# where /prefix/for/rear/working/directory must already exist.
# This is useful for example when there is not sufficient free space
# in /tmp or $TMPDIR for the ISO image or even the backup archive.

6
SOURCES/rear-rhbz1610647.patch
View File

@ -1,5 +1,5 @@
diff --git a/usr/share/rear/finalize/Linux-ppc64le/680_install_PPC_bootlist.sh b/usr/share/rear/finalize/Linux-ppc64le/680_install_PPC_bootlist.sh
index bf1db404..49480f38 100644
index bf1db404..3a07580a 100644
--- a/usr/share/rear/finalize/Linux-ppc64le/680_install_PPC_bootlist.sh
+++ b/usr/share/rear/finalize/Linux-ppc64le/680_install_PPC_bootlist.sh
@@ -9,9 +9,12 @@ if grep -q "PowerNV" /proc/cpuinfo || grep -q "emulated by qemu" /proc/cpuinfo ;
@ -42,8 +42,8 @@ index bf1db404..49480f38 100644
fi
+
+if [[ ${#boot_list[@]} -gt 0 ]]; then
+ LogPrint "Set LPAR bootlist to '${boot_list[@]}'"
+ bootlist -m normal $boot_list
+ LogPrint "Set LPAR bootlist to '${boot_list[*]}'"
+ bootlist -m normal "${boot_list[@]}"
+ LogPrintIfError "Unable to set bootlist. You will have to start in SMS to set it up manually."
+fi
+

14
SPECS/rear.spec
View File

@ -3,7 +3,7 @@
Summary: Relax-and-Recover is a Linux disaster recovery and system migration tool
Name: rear
Version: 2.4
Release: 8%{?dist}
Release: 10%{?dist}
License: GPLv3
Group: Applications/File
URL: http://relax-and-recover.org/
@ -20,6 +20,7 @@ Patch12: rear-bz1659137.patch
patch13: rear-bz1663515.patch
Patch14: rear-bz1672938.patch
Patch15: rear-bz1685166.patch
Patch16: rear-bz1655956.patch
ExcludeArch: s390x
ExcludeArch: s390
@ -116,6 +117,7 @@ fi
%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch16 -p1
echo "30 1 * * * root /usr/sbin/rear checklayout || /usr/sbin/rear mkrescue" >rear.cron
@ -149,6 +151,16 @@ TZ=UTC %{__make} -C doc
%{_sbindir}/rear
%changelog
* Tue Jun 4 2019 Pavel Cahyna <pcahyna@redhat.com> - 2.4-10
- Apply upstream patch PR1993
Automatically exclude $BUILD_DIR from the backup
Resolves: rhbz1677733
* Mon Jun 3 2019 Pavel Cahyna <pcahyna@redhat.com> - 2.4-9
- Update fix for bz#1657725. Previous fix was not correct, bootlist was still
invoked only with one partition argument due to incorrect array expansion.
See upstream PR2096, 2097, 2098.
* Tue May 28 2019 Pavel Cahyna <pcahyna@redhat.com> - 2.4-8
- Apply upstream PR2065 (record permanent MAC address for team members)
Resolves: rhbz1685178