From 1ce466cec2cc722c4b0509cb7f8226764f7040ac Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 06 2018 18:39:28 +0000 Subject: import rear-2.00-5.el7_4 --- diff --git a/SOURCES/bz1506231.patch b/SOURCES/bz1506231.patch new file mode 100644 index 0000000..f94f66b --- /dev/null +++ b/SOURCES/bz1506231.patch @@ -0,0 +1,23 @@ +diff -up rear-2.00/usr/share/rear/rescue/NBU/default/450_prepare_netbackup.sh.bz1506231 rear-2.00/usr/share/rear/rescue/NBU/default/450_prepare_netbackup.sh +--- rear-2.00/usr/share/rear/rescue/NBU/default/450_prepare_netbackup.sh.bz1506231 2017-11-02 10:29:57.000000000 +0100 ++++ rear-2.00/usr/share/rear/rescue/NBU/default/450_prepare_netbackup.sh 2017-11-27 11:58:54.000000000 +0100 +@@ -7,6 +7,9 @@ + + [[ $NBU_version -lt 7 ]] && return # NBU is using xinetd when version <7.x + +-cp $v /etc/init.d/netbackup $ROOTFS_DIR/etc/scripts/system-setup.d/90-netbackup.sh +-[ -f $ROOTFS_DIR/etc/scripts/system-setup.d/90-netbackup.sh ] && \ ++if [ -e "/etc/init.d/netbackup" ]; then ++ cp $v /etc/init.d/netbackup $ROOTFS_DIR/etc/scripts/system-setup.d/netbackup.real ++ chmod $v +x $ROOTFS_DIR/etc/scripts/system-setup.d/netbackup.real ++ echo "( /etc/scripts/system-setup.d/netbackup.real )" > $ROOTFS_DIR/etc/scripts/system-setup.d/90-netbackup.sh + chmod $v +x $ROOTFS_DIR/etc/scripts/system-setup.d/90-netbackup.sh ++fi +diff -up rear-2.00/usr/share/rear/skel/default/usr/lib/systemd/system/sysinit.service.bz1506231 rear-2.00/usr/share/rear/skel/default/usr/lib/systemd/system/sysinit.service +--- rear-2.00/usr/share/rear/skel/default/usr/lib/systemd/system/sysinit.service.bz1506231 2017-11-27 11:57:54.000000000 +0100 ++++ rear-2.00/usr/share/rear/skel/default/usr/lib/systemd/system/sysinit.service 2017-11-27 11:58:09.000000000 +0100 +@@ -6,3 +6,4 @@ After=systemd-udevd.service + Type=oneshot + ExecStart=/etc/scripts/system-setup + StandardInput=tty ++RemainAfterExit=yes diff --git a/SPECS/rear.spec b/SPECS/rear.spec index c39ba30..eb9e15c 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: 4%{?dist} +Release: 5%{?dist} License: GPLv3 Group: Applications/File URL: http://relax-and-recover.org/ @@ -10,10 +10,12 @@ 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 -Patch1: rear-bz1532676-pr1685.patch +Patch2: rear-bz1532676-pr1685.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 +Patch3: bz1506231.patch + BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) ExcludeArch: s390x ExcludeArch: s390 @@ -97,8 +99,9 @@ fi %prep %setup %patch0 -p1 -%patch1 -p1 -#%patch2 -p1 +#%patch1 -p1 +%patch2 -p1 +%patch3 -p1 echo "30 1 * * * root /usr/sbin/rear checklayout || /usr/sbin/rear mkrescue" >rear.cron @@ -128,6 +131,12 @@ echo "30 1 * * * root /usr/sbin/rear checklayout || /usr/sbin/rear mkrescue" >re %{_sbindir}/rear %changelog +* Fri Feb 16 2018 Pavel Cahyna - 2.00-5 +- Ensure that NetBackup is started automatically upon recovery (PR#1544) + Also do not kill daemons spawned by sysinit.service at the service's end + (PR#1610, applies to NetBackup and also to dhclient) + Resolves #1506231 + * Fri Jan 12 2018 Pavel Cahyna - 2.00-4 - cd to the correct directory before md5sum to fix BACKUP_INTEGRITY_CHECK. Upstream PR#1685, bz1532676