diff --git a/SOURCES/rear-bz1571266-pr1383.patch b/SOURCES/rear-bz1571266-pr1383.patch new file mode 100644 index 0000000..1ed6ddf --- /dev/null +++ b/SOURCES/rear-bz1571266-pr1383.patch @@ -0,0 +1,125 @@ +diff --git a/usr/share/rear/output/ISO/Linux-ppc64/800_create_isofs.sh b/usr/share/rear/output/ISO/Linux-ppc64/800_create_isofs.sh +deleted file mode 100644 +index 005de330..00000000 +--- a/usr/share/rear/output/ISO/Linux-ppc64/800_create_isofs.sh ++++ /dev/null +@@ -1,34 +0,0 @@ +-# 800_create_isofs.sh +-# +-# create initramfs for Relax-and-Recover +-# +-# This file is part of Relax-and-Recover, licensed under the GNU General +-# Public License. Refer to the included COPYING for full text of license. +- +-# check that we have mkisofs +-[ -x "$ISO_MKISOFS_BIN" ] +-StopIfError "ISO_MKISOFS_BIN [$ISO_MKISOFS_BIN] not an executable !" +- +-Log "Copying kernel" +-cp -pL $v $KERNEL_FILE $TMP_DIR/kernel >&2 +- +-if [[ "$SUSE_STYLE" ]]; then +- ISO_FILES=( ${ISO_FILES[@]} $TMP_DIR/kernel initrd.cgz yaboot) +-else +- ISO_FILES=( ${ISO_FILES[@]} $TMP_DIR/kernel initrd.cgz) +-fi +-Log "Starting '$ISO_MKISOFS_BIN'" +-LogPrint "Making ISO image" +- +-mkdir -p $v "$ISO_DIR" >&2 +-StopIfError "Could not create ISO ouput directory ($ISO_DIR)" +- +-pushd $TMP_DIR >&8 # so that relative paths will work +-$ISO_MKISOFS_BIN $v -o "$ISO_DIR/$ISO_PREFIX.iso" -U -chrp-boot \ +- -R -J -volid "$ISO_VOLID" -v -graft-points "${ISO_FILES[@]}" >&8 +-StopIfError "Could not create ISO image" +-popd >&8 +-Print "Wrote ISO Image $ISO_DIR/$ISO_PREFIX.iso ($(du -h "$ISO_DIR/$ISO_PREFIX.iso"| tr -s " \t" " " | cut -d " " -f 1))" +- +-# Add ISO image to result files +-RESULT_FILES=( "${RESULT_FILES[@]}" "$ISO_DIR/$ISO_PREFIX.iso" ) +diff --git a/usr/share/rear/output/ISO/Linux-ppc64/800_create_isofs.sh b/usr/share/rear/output/ISO/Linux-ppc64/800_create_isofs.sh +new file mode 120000 +index 00000000..b2cd4893 +--- /dev/null ++++ b/usr/share/rear/output/ISO/Linux-ppc64/800_create_isofs.sh +@@ -0,0 +1 @@ ++../Linux-ppc64le/800_create_isofs.sh +\ No newline at end of file +diff --git a/usr/share/rear/output/ISO/Linux-ppc64/810_prepare_multiple_iso.sh b/usr/share/rear/output/ISO/Linux-ppc64/810_prepare_multiple_iso.sh +new file mode 120000 +index 00000000..04f8a495 +--- /dev/null ++++ b/usr/share/rear/output/ISO/Linux-ppc64/810_prepare_multiple_iso.sh +@@ -0,0 +1 @@ ++../Linux-i386/810_prepare_multiple_iso.sh +\ No newline at end of file +diff --git a/usr/share/rear/output/ISO/Linux-ppc64/820_create_iso_image.sh b/usr/share/rear/output/ISO/Linux-ppc64/820_create_iso_image.sh +new file mode 120000 +index 00000000..981cfd2e +--- /dev/null ++++ b/usr/share/rear/output/ISO/Linux-ppc64/820_create_iso_image.sh +@@ -0,0 +1 @@ ++../Linux-ppc64le/820_create_iso_image.sh +\ No newline at end of file +diff --git a/usr/share/rear/output/ISO/Linux-ppc64le/800_create_isofs.sh b/usr/share/rear/output/ISO/Linux-ppc64le/800_create_isofs.sh +index f0c023cd..d9ce61de 100644 +--- a/usr/share/rear/output/ISO/Linux-ppc64le/800_create_isofs.sh ++++ b/usr/share/rear/output/ISO/Linux-ppc64le/800_create_isofs.sh +@@ -18,13 +18,3 @@ LogPrint "Making ISO image" + + mkdir -p $v "$ISO_DIR" >&2 + StopIfError "Could not create ISO ouput directory ($ISO_DIR)" +- +-pushd $TMP_DIR >&8 # so that relative paths will work +-$ISO_MKISOFS_BIN $v -o "$ISO_DIR/$ISO_PREFIX.iso" -U -chrp-boot \ +- -R -J -volid "$ISO_VOLID" -v -graft-points "${ISO_FILES[@]}" >&8 +-StopIfError "Could not create ISO image" +-popd >&8 +-Print "Wrote ISO Image $ISO_DIR/$ISO_PREFIX.iso ($(du -h "$ISO_DIR/$ISO_PREFIX.iso"| tr -s " \t" " " | cut -d " " -f 1))" +- +-# Add ISO image to result files +-RESULT_FILES=( "${RESULT_FILES[@]}" "$ISO_DIR/$ISO_PREFIX.iso" ) +diff --git a/usr/share/rear/output/ISO/Linux-ppc64le/810_prepare_multiple_iso.sh b/usr/share/rear/output/ISO/Linux-ppc64le/810_prepare_multiple_iso.sh +new file mode 120000 +index 00000000..04f8a495 +--- /dev/null ++++ b/usr/share/rear/output/ISO/Linux-ppc64le/810_prepare_multiple_iso.sh +@@ -0,0 +1 @@ ++../Linux-i386/810_prepare_multiple_iso.sh +\ No newline at end of file +diff --git a/usr/share/rear/output/ISO/Linux-ppc64le/820_create_iso_image.sh b/usr/share/rear/output/ISO/Linux-ppc64le/820_create_iso_image.sh +new file mode 100644 +index 00000000..28b6464f +--- /dev/null ++++ b/usr/share/rear/output/ISO/Linux-ppc64le/820_create_iso_image.sh +@@ -0,0 +1,29 @@ ++ ++Log "Starting '$ISO_MKISOFS_BIN'" ++LogPrint "Making ISO image" ++ ++pushd $TMP_DIR >&2 ++ ++# If isofs directory exists, add its content to ISO_FILES (when backup must be part of the ISO images) ++if [ -d isofs ] ; then ++ ISO_FILES=( ${ISO_FILES[@]} isofs ) ++fi ++ ++# mkisofs command for ppc64/ppc64le arch ++# Adapt the chrp-boot option if xorrisofs is used. ++if [[ "$(basename $ISO_MKISOFS_BIN)" == "xorrisofs" ]]; then ++ chrp_boot_option="-chrp-boot-part" ++else ++ chrp_boot_option="-chrp-boot" ++fi ++ ++$ISO_MKISOFS_BIN $v -o "$ISO_DIR/$ISO_PREFIX.iso" -U $chrp_boot_option -R -J -volid "$ISO_VOLID" -v -graft-points "${ISO_FILES[@]}" >&2 ++ ++StopIfError "Could not create ISO image (with $ISO_MKISOFS_BIN)" ++popd >&2 ++ ++iso_image_size=( $(du -h "$ISO_DIR/$ISO_PREFIX.iso") ) ++LogPrint "Wrote ISO image: $ISO_DIR/$ISO_PREFIX.iso ($iso_image_size)" ++ ++# Add ISO image to result files ++RESULT_FILES=( "${RESULT_FILES[@]}" "$ISO_DIR/$ISO_PREFIX.iso" ) diff --git a/SPECS/rear.spec b/SPECS/rear.spec index 0dbadf8..9a00ebb 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.00 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv3 Group: Applications/File URL: http://relax-and-recover.org/ @@ -17,6 +17,7 @@ Patch2: rear-bz1532676-pr1685.patch #Patch2: 0003-Added-some-explanation-of-PRE-POST-backup-scripts-in.patch Patch3: bz1506231.patch Patch4: rear-bz1492177-warning.patch +Patch5: rear-bz1571266-pr1383.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) ExcludeArch: s390x @@ -105,6 +106,7 @@ fi %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 echo "30 1 * * * root /usr/sbin/rear checklayout || /usr/sbin/rear mkrescue" >rear.cron @@ -134,6 +136,11 @@ echo "30 1 * * * root /usr/sbin/rear checklayout || /usr/sbin/rear mkrescue" >re %{_sbindir}/rear %changelog +* Fri Jul 13 2018 Pavel Cahyna - 2.00-7 +- Backport upstream PR1383: Allow backup to be stored in ISO for ppc64/ppc64le + Includes also commit 30099a98fdc1eab6373bc3682929bc4b9c09b54b. + Resolves: #1596182 + * Wed Feb 14 2018 Pavel Cahyna - 2.00-6 - Ensure that NetBackup is started automatically upon recovery (PR#1544) Also do not kill daemons spawned by sysinit.service at the service's end