Hello community, here is the log from the commit of package rear for openSUSE:Factory checked in at Mon Feb 21 00:23:15 CET 2011.
-------- --- rear/rear.changes 2011-02-14 11:44:50.000000000 +0100 +++ /mounts/work_src_done/STABLE/rear/rear.changes 2011-02-20 20:08:00.000000000 +0100 @@ -1,0 +2,9 @@ +Sun Feb 20 19:04:45 UTC 2011 - [email protected] + +- updated to rear 1.10.0 from upstream + * remove symlinks that conflict with directories to resolve RPM upgrade problems + * add OS_MASTER_* variables to define a parent distro, e.g. Fedora for CentOS + * remove Linux-x86_64 and map it to Linux-i386 to remove a lot of symlinks pointing to directories + * bugfixes for tape blocksize and bootable USB media + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- debian.control debian.copyright debian.rules rear-1.9.0.tar.gz New: ---- rear-1.10.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rear.spec ++++++ --- /var/tmp/diff_new_pack.TwAeWp/_old 2011-02-21 00:23:02.000000000 +0100 +++ /var/tmp/diff_new_pack.TwAeWp/_new 2011-02-21 00:23:02.000000000 +0100 @@ -18,7 +18,7 @@ Name: rear -Version: 1.9.0 +Version: 1.10.0 Release: 1 Summary: Relax and Recover (ReaR) is a Linux Disaster Recovery framework @@ -146,15 +146,6 @@ %clean rm -rf $RPM_BUILD_ROOT -%pre -# remove dirs that turned into symlinks because RPM fails on them - -for d in %{_datadir}/rear/*/CentOS ; do - if test -d "$d" -a \! -L "$d" ; then - rm -rfv "$d" - fi -done - %files %defattr(-,root,root,-) %doc COPYING CHANGES README doc/* ++++++ rear-1.9.0.tar.gz -> rear-1.10.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/CHANGES new/rear-1.10.0/CHANGES --- old/rear-1.9.0/CHANGES 2011-02-02 14:50:19.000000000 +0100 +++ new/rear-1.10.0/CHANGES 2011-02-20 20:01:26.000000000 +0100 @@ -1,8 +1,20 @@ -Version 1.10 - Not yet released ---------------------------------- +Version 1.10.0 - 2011-02-20 +--------------------------- +2011-02-20 GSS * removed all Linux-x86_64 symlinks and map it to Linux-i386 instead +2011-02-16 GSS * add OS_MASTER_* variables to map distros to their upstream distros + * remove all distro symlinks (e.g. CentOS -> Fedora) + * reorganize some wrong subdirectories, e.g. Ubuntu instead of Debian + * adjust all ReaR mechanics to support OS_MASTER_* stuff and also manage if these + are empty. + * log the automatic switch to USE_DHCLIENT +2011-02-09 GD * add link under finalize from RedHatEnterpriseClient to Fedora as pointed out by + Olivier KALOUDOFF + * 85_make_USB_bootable.sh: applied patch from Jeroen and Dag (SF#3170685) + * setting blocksize to 2048 for OBDR tapes - patch SF#3169791 (from Dag Wieers) + These scripts live under output/OBDR/default/ -Version 1.9 - 2011-02-02 -------------------------- +Version 1.9.0 - 2011-02-02 +--------------------------- 2011-01-30 GSS * Add /etc/localtime to COPY_AS_IS 2011-01-25 GD * 21_include_dhclient.sh: make it IPv4/IPv6 aware and look for other DHCP clients such as dhclient, dhcpcd, dhclient6, dhcp6c, or user defined via DHCLIENT_BIN or DHCLIENT6_BIN @@ -24,7 +36,7 @@ * svn2host: handle also DEB style machines by copying stuff into /usr. TODO: build DEB packages. 2011-01-20 GD * Apply patch 'Protect tapes from being scratched' SF#3162557 New workflow: rear labeltape - Sponsored by Belgian Federal Police by Dagand Jeroen + Sponsored by Belgian Federal Police (Dag and Jeroen) * 58-start-dhclient.sh: removed the "-v" (bug report SF#3157282) * _input-output-functions.sh: new SpinnerSleep function 2011-01-19 GD * Merge BEXTRACT/BACULA for tape and disk support - SF#3158159 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/sbin/rear new/rear-1.10.0/usr/sbin/rear --- old/rear-1.9.0/usr/sbin/rear 2011-02-02 14:49:08.000000000 +0100 +++ new/rear-1.10.0/usr/sbin/rear 2011-02-20 19:59:48.000000000 +0100 @@ -23,8 +23,8 @@ # Versioning PRODUCT="Relax & Recover" -VERSION="1.9.0" -RELEASE_DATE="2011-02-02" +VERSION="1.10.0" +RELEASE_DATE="2011-02-20" COPYRIGHT="Copyright (C) 2006-2011 Schlomo Schapiro @@ -221,8 +221,12 @@ Source "$CONFIG_DIR/$WORKFLOW.conf" SetOSVendorAndVersion # distribution configuration files -for config in "$ARCH" "$OS" "$OS_VENDOR" "$OS_VENDOR_ARCH" "$OS_VENDOR_VERSION" "$OS_VENDOR_VERSION_ARCH" ; do - Source $SHARE_DIR/conf/"$config".conf +for config in "$ARCH" "$OS" \ + "$OS_MASTER_VENDOR" "$OS_MASTER_VENDOR_ARCH" "$OS_MASTER_VENDOR_VERSION" "$OS_MASTER_VENDOR_VERSION_ARCH" \ + "$OS_VENDOR" "$OS_VENDOR_ARCH" "$OS_VENDOR_VERSION" "$OS_VENDOR_VERSION_ARCH" ; do + if test "$config" ; then + Source $SHARE_DIR/conf/"$config".conf + fi done # user configuration files for config in site local ; do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/CHANGES new/rear-1.10.0/usr/share/rear/CHANGES --- old/rear-1.9.0/usr/share/rear/CHANGES 2011-02-02 14:49:08.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/CHANGES 2011-02-20 20:01:00.000000000 +0100 @@ -1,8 +1,20 @@ -Version 1.10 - Not yet released ---------------------------------- +Version 1.10.0 - 2011-02-20 +--------------------------- +2011-02-20 GSS * removed all Linux-x86_64 symlinks and map it to Linux-i386 instead +2011-02-16 GSS * add OS_MASTER_* variables to map distros to their upstream distros + * remove all distro symlinks (e.g. CentOS -> Fedora) + * reorganize some wrong subdirectories, e.g. Ubuntu instead of Debian + * adjust all ReaR mechanics to support OS_MASTER_* stuff and also manage if these + are empty. + * log the automatic switch to USE_DHCLIENT +2011-02-09 GD * add link under finalize from RedHatEnterpriseClient to Fedora as pointed out by + Olivier KALOUDOFF + * 85_make_USB_bootable.sh: applied patch from Jeroen and Dag (SF#3170685) + * setting blocksize to 2048 for OBDR tapes - patch SF#3169791 (from Dag Wieers) + These scripts live under output/OBDR/default/ -Version 1.9 - 2011-02-02 -------------------------- +Version 1.9.0 - 2011-02-02 +--------------------------- 2011-01-30 GSS * Add /etc/localtime to COPY_AS_IS 2011-01-25 GD * 21_include_dhclient.sh: make it IPv4/IPv6 aware and look for other DHCP clients such as dhclient, dhcpcd, dhclient6, dhcp6c, or user defined via DHCLIENT_BIN or DHCLIENT6_BIN @@ -24,7 +36,7 @@ * svn2host: handle also DEB style machines by copying stuff into /usr. TODO: build DEB packages. 2011-01-20 GD * Apply patch 'Protect tapes from being scratched' SF#3162557 New workflow: rear labeltape - Sponsored by Belgian Federal Police by Dagand Jeroen + Sponsored by Belgian Federal Police (Dag and Jeroen) * 58-start-dhclient.sh: removed the "-v" (bug report SF#3157282) * _input-output-functions.sh: new SpinnerSleep function 2011-01-19 GD * Merge BEXTRACT/BACULA for tape and disk support - SF#3158159 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/build/Debian/x86_64 new/rear-1.10.0/usr/share/rear/build/Debian/x86_64 --- old/rear-1.9.0/usr/share/rear/build/Debian/x86_64 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/build/Debian/x86_64 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to i386 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/build/Ubuntu new/rear-1.10.0/usr/share/rear/build/Ubuntu --- old/rear-1.9.0/usr/share/rear/build/Ubuntu 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/build/Ubuntu 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Debian diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/conf/Linux-x86_64.conf new/rear-1.10.0/usr/share/rear/conf/Linux-x86_64.conf --- old/rear-1.9.0/usr/share/rear/conf/Linux-x86_64.conf 2011-02-02 14:49:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/conf/Linux-x86_64.conf 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -LIBS=( -${LIBS[@]} -/lib64/libnss_dns* -/lib64/libnss_files* -) - -# include also i386 settings -. $SHARE_DIR/conf/Linux-i386.conf - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/conf/default.conf new/rear-1.10.0/usr/share/rear/conf/default.conf --- old/rear-1.9.0/usr/share/rear/conf/default.conf 2011-02-02 14:49:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/conf/default.conf 2011-02-20 19:10:36.000000000 +0100 @@ -43,7 +43,9 @@ # machine architecture, OS independant MACHINE="$(uname -m )" case "$MACHINE" in - i686|i586) + x86_64|i686|i586) + # all these behave exactly like i386. For 64bit we took care to handle the + # special cases within the 32bit scripts to prevent code duplication MACHINE=i386 ;; esac @@ -292,6 +294,9 @@ COPY_AS_IS_EXCLUDE_OBDR=( ) PROGS_OBDR=( lsscsi sg_wr_mode ) +# OBDR block size, known to work with 2048 +OBDR_BLOCKSIZE=2048 + ## # BACKUP=NBU stuff (Symantec/Veritas NetBackup) ## diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/contrib/rear-1.10.0.ebuild new/rear-1.10.0/usr/share/rear/contrib/rear-1.10.0.ebuild --- old/rear-1.9.0/usr/share/rear/contrib/rear-1.10.0.ebuild 1970-01-01 01:00:00.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/contrib/rear-1.10.0.ebuild 2011-02-03 20:38:31.000000000 +0100 @@ -0,0 +1,44 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + + +inherit eutils depend.php + +DESCRIPTION="ReaR - Relax and Recover | Disaster Recovery for GNU/Linux" +HOMEPAGE="http://rear.sourceforge.net/"; +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +KEYWORDS="~amd64 x86" +LICENSE="GPL-2" +SLOT="1" + +RDEPEND="sys-apps/util-linux + net-dialup/mingetty + sys-apps/lsb-release + sys-apps/iproute2 + net-fs/nfs-utils + sys-boot/syslinux + app-cdr/cdrtools" + +S=${WORKDIR} + +src_unpack() { + unpack ${A} +} + +src_compile() { + einfo "Nothing to compile." +} + +src_install() { + dodir /usr/share/rear /etc/rear + cp -rPR ${S}/${P}/etc/rear/* "${D}etc/rear" + cp -rPR ${S}/${P}/usr/share/rear/* "${D}usr/share/rear" + dosbin ${S}/${P}/usr/sbin/rear +} + +pkg_config() { + einfo Rear - Relax and Recover was successfully installed + einfo you can get information about configuration on + einfo the website http://rear.sourceforge.net/documentation.php +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/contrib/rear-1.9.0.ebuild new/rear-1.10.0/usr/share/rear/contrib/rear-1.9.0.ebuild --- old/rear-1.9.0/usr/share/rear/contrib/rear-1.9.0.ebuild 2011-02-02 14:49:07.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/contrib/rear-1.9.0.ebuild 1970-01-01 01:00:00.000000000 +0100 @@ -1,44 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - - -inherit eutils depend.php - -DESCRIPTION="ReaR - Relax and Recover | Disaster Recovery for GNU/Linux" -HOMEPAGE="http://rear.sourceforge.net/"; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -KEYWORDS="~amd64 x86" -LICENSE="GPL-2" -SLOT="1" - -RDEPEND="sys-apps/util-linux - net-dialup/mingetty - sys-apps/lsb-release - sys-apps/iproute2 - net-fs/nfs-utils - sys-boot/syslinux - app-cdr/cdrtools" - -S=${WORKDIR} - -src_unpack() { - unpack ${A} -} - -src_compile() { - einfo "Nothing to compile." -} - -src_install() { - dodir /usr/share/rear /etc/rear - cp -rPR ${S}/${P}/etc/rear/* "${D}etc/rear" - cp -rPR ${S}/${P}/usr/share/rear/* "${D}usr/share/rear" - dosbin ${S}/${P}/usr/sbin/rear -} - -pkg_config() { - einfo Rear - Relax and Recover was successfully installed - einfo you can get information about configuration on - einfo the website http://rear.sourceforge.net/documentation.php -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/dr/Linux-x86_64 new/rear-1.10.0/usr/share/rear/dr/Linux-x86_64 --- old/rear-1.9.0/usr/share/rear/dr/Linux-x86_64 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/dr/Linux-x86_64 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Linux-i386 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/finalize/CentOS new/rear-1.10.0/usr/share/rear/finalize/CentOS --- old/rear-1.9.0/usr/share/rear/finalize/CentOS 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/finalize/CentOS 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Fedora diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/finalize/Debian/x86_64 new/rear-1.10.0/usr/share/rear/finalize/Debian/x86_64 --- old/rear-1.9.0/usr/share/rear/finalize/Debian/x86_64 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/finalize/Debian/x86_64 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to i386 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/finalize/Fedora/x86_64 new/rear-1.10.0/usr/share/rear/finalize/Fedora/x86_64 --- old/rear-1.9.0/usr/share/rear/finalize/Fedora/x86_64 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/finalize/Fedora/x86_64 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to i386 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/finalize/FedoraCore new/rear-1.10.0/usr/share/rear/finalize/FedoraCore --- old/rear-1.9.0/usr/share/rear/finalize/FedoraCore 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/finalize/FedoraCore 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Fedora diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/finalize/Gentoo/x86_64 new/rear-1.10.0/usr/share/rear/finalize/Gentoo/x86_64 --- old/rear-1.9.0/usr/share/rear/finalize/Gentoo/x86_64 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/finalize/Gentoo/x86_64 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to i386 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/finalize/LinuxMint new/rear-1.10.0/usr/share/rear/finalize/LinuxMint --- old/rear-1.9.0/usr/share/rear/finalize/LinuxMint 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/finalize/LinuxMint 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Debian diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/finalize/RedHatEnterpriseAS new/rear-1.10.0/usr/share/rear/finalize/RedHatEnterpriseAS --- old/rear-1.9.0/usr/share/rear/finalize/RedHatEnterpriseAS 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/finalize/RedHatEnterpriseAS 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Fedora diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/finalize/RedHatEnterpriseES new/rear-1.10.0/usr/share/rear/finalize/RedHatEnterpriseES --- old/rear-1.9.0/usr/share/rear/finalize/RedHatEnterpriseES 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/finalize/RedHatEnterpriseES 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Fedora diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/finalize/RedHatEnterpriseServer new/rear-1.10.0/usr/share/rear/finalize/RedHatEnterpriseServer --- old/rear-1.9.0/usr/share/rear/finalize/RedHatEnterpriseServer 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/finalize/RedHatEnterpriseServer 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Fedora diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/finalize/SUSE_LINUX/x86_64 new/rear-1.10.0/usr/share/rear/finalize/SUSE_LINUX/x86_64 --- old/rear-1.9.0/usr/share/rear/finalize/SUSE_LINUX/x86_64 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/finalize/SUSE_LINUX/x86_64 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to i386 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/finalize/ScientificSL new/rear-1.10.0/usr/share/rear/finalize/ScientificSL --- old/rear-1.9.0/usr/share/rear/finalize/ScientificSL 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/finalize/ScientificSL 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Fedora diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/finalize/Ubuntu new/rear-1.10.0/usr/share/rear/finalize/Ubuntu --- old/rear-1.9.0/usr/share/rear/finalize/Ubuntu 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/finalize/Ubuntu 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Debian diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/lib/config-functions.sh new/rear-1.10.0/usr/share/rear/lib/config-functions.sh --- old/rear-1.9.0/usr/share/rear/lib/config-functions.sh 2011-02-02 14:49:08.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/lib/config-functions.sh 2011-02-20 19:19:24.000000000 +0100 @@ -50,4 +50,38 @@ OS_VENDOR_ARCH="$OS_VENDOR/$MACHINE" OS_VENDOR_VERSION_ARCH="$OS_VENDOR/$OS_VERSION/$MACHINE" + # add OS_MASTER_* vars in case this is a derived OS + case "$OS_VENDOR_VERSION" in + (*CentOS*|*FedoraCore*|*RedHat*|*ScientificSL*) + OS_MASTER_VENDOR="Fedora" + case "$OS_VERSION" in + (5.*) + # map all RHEL 5.x and clones to Fedora/5 + # this is safe because FedoraCore 5 never existed + OS_MASTER_VERSION="5" + ;; + (6.*) + # map all RHEL 5.x and clones to Fedora/5 + # this is safe because FedoraCore 5 never existed + OS_MASTER_VERSION="6" + ;; + (*) + OS_MASTER_VERSION="$OS_VERSION" + ;; + esac + ;; + (*Ubuntu*|*LinuxMint*) + OS_MASTER_VENDOR="Debian" + OS_MASTER_VERSION="$OS_VERSION" + ;; + esac + + # combined stuff for OS_MASTER_* + if [ "$OS_MASTER_VENDOR" ] ; then + OS_MASTER_VENDOR_VERSION="$OS_MASTER_VENDOR/$OS_MASTER_VERSION" + OS_MASTER_VENDOR_ARCH="$OS_MASTER_VENDOR/$MACHINE" + OS_MASTER_VENDOR_VERSION_ARCH="$OS_MASTER_VENDOR/$OS_MASTER_VERSION/$MACHINE" + fi + + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/lib/dump-workflow.sh new/rear-1.10.0/usr/share/rear/lib/dump-workflow.sh --- old/rear-1.9.0/usr/share/rear/lib/dump-workflow.sh 2011-02-02 14:49:08.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/lib/dump-workflow.sh 2011-02-16 22:57:44.000000000 +0100 @@ -24,15 +24,21 @@ LogPrint "Dumping out configuration and system information" LogPrint "System definition:" - for var in "ARCH" "OS" "OS_VENDOR" "OS_VERSION" "OS_VENDOR_ARCH" "OS_VENDOR_VERSION" "OS_VENDOR_VERSION_ARCH"; do + for var in "ARCH" "OS" \ + "OS_MASTER_VENDOR" "OS_MASTER_VERSION" "OS_MASTER_VENDOR_ARCH" "OS_MASTER_VENDOR_VERSION" "OS_MASTER_VENDOR_VERSION_ARCH" \ + "OS_VENDOR" "OS_VERSION" "OS_VENDOR_ARCH" "OS_VENDOR_VERSION" "OS_VENDOR_VERSION_ARCH"; do LogPrint "$( printf "%40s = %s" "$var" "${!var}" )" done LogPrint "Configuration tree:" - for config in "$ARCH" "$OS" "$OS_VENDOR" "$OS_VENDOR_ARCH" "$OS_VENDOR_VERSION" "$OS_VENDOR_VERSION_ARCH" ; do - LogPrint "$( printf "%40s : %s" "$config".conf "$( - test -s $SHARE_DIR/conf/"$config".conf && echo OK || echo missing/empty - )" )" + for config in "$ARCH" "$OS" \ + "$OS_MASTER_VENDOR" "$OS_MASTER_VENDOR_ARCH" "$OS_MASTER_VENDOR_VERSION" "$OS_MASTER_VENDOR_VERSION_ARCH" \ + "$OS_VENDOR" "$OS_VENDOR_ARCH" "$OS_VENDOR_VERSION" "$OS_VENDOR_VERSION_ARCH"; do + if [ "$config" ] ; then + LogPrint "$( printf "%40s : %s" "$config".conf "$( + test -s $SHARE_DIR/conf/"$config".conf && echo OK || echo missing/empty + )" )" + fi done for config in site local ; do LogPrint "$( printf "%40s : %s" "$config".conf "$( @@ -71,6 +77,14 @@ LogPrint "Your system is not yet validated. Please carefully check all functions" LogPrint "and create a validation record with '$0 validate'. This will help others" LogPrint "to know about the validation status of $PRODUCT on this system." + # if the master OS is validated print out a suitable hint + if test -s "$SHARE_DIR/lib/validated/$OS_MASTER_VENDOR_VERSION_ARCH.txt" ; then + LogPrint "" + LogPrint "Your system is derived from $OS_MASTER_VENDOR_VERSION which is validated:" + while read -r ; do + LogPrint "$REPLY" + done <"$SHARE_DIR/lib/validated/$OS_MASTER_VENDOR_VERSION_ARCH.txt" + fi fi } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/lib/rear.spec new/rear-1.10.0/usr/share/rear/lib/rear.spec --- old/rear-1.9.0/usr/share/rear/lib/rear.spec 2011-02-02 14:50:19.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/lib/rear.spec 2011-02-20 20:01:26.000000000 +0100 @@ -1,5 +1,5 @@ Name: rear -Version: 1.9.0 +Version: 1.10.0 Release: 1%{?dist} Summary: Relax and Recover (ReaR) is a Linux Disaster Recovery framework diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/lib/shell-script-functions.sh new/rear-1.10.0/usr/share/rear/lib/shell-script-functions.sh --- old/rear-1.9.0/usr/share/rear/lib/shell-script-functions.sh 2011-02-02 14:49:08.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/lib/shell-script-functions.sh 2011-02-16 21:10:01.000000000 +0100 @@ -20,6 +20,10 @@ # source a file given in $1 Source () { + # skip empty + if test -z "$1" ; then + return + fi if test -d "$1" ; then Error "$1 is a directory, cannot source" fi @@ -54,10 +58,10 @@ cd $SHARE_DIR/$stage ; # We always source scripts in the same subdirectory structure. The {..,..,..} way of writing # it is just a shell shortcut that expands as intended. - ls -d {default,"$ARCH","$OS","$OS_VENDOR","$OS_VENDOR_ARCH","$OS_VENDOR_VERSION"}/*.sh \ - "$BACKUP"/{default,"$ARCH","$OS","$OS_VENDOR","$OS_VENDOR_ARCH","$OS_VENDOR_VERSION"}/*.sh \ - "$OUTPUT"/{default,"$ARCH","$OS","$OS_VENDOR","$OS_VENDOR_ARCH","$OS_VENDOR_VERSION"}/*.sh \ - "$OUTPUT"/"$BACKUP"/{default,"$ARCH","$OS","$OS_VENDOR","$OS_VENDOR_ARCH","$OS_VENDOR_VERSION"}/*.sh \ + ls -d {default,"$ARCH","$OS","$OS_MASTER_VENDOR","$OS_MASTER_VENDOR_ARCH","$OS_MASTER_VENDOR_VERSION","$OS_VENDOR","$OS_VENDOR_ARCH","$OS_VENDOR_VERSION"}/*.sh \ + "$BACKUP"/{default,"$ARCH","$OS","$OS_MASTER_VENDOR","$OS_MASTER_VENDOR_ARCH","$OS_MASTER_VENDOR_VERSION","$OS_VENDOR","$OS_VENDOR_ARCH","$OS_VENDOR_VERSION"}/*.sh \ + "$OUTPUT"/{default,"$ARCH","$OS","$OS_MASTER_VENDOR","$OS_MASTER_VENDOR_ARCH","$OS_MASTER_VENDOR_VERSION","$OS_VENDOR","$OS_VENDOR_ARCH","$OS_VENDOR_VERSION"}/*.sh \ + "$OUTPUT"/"$BACKUP"/{default,"$ARCH","$OS","$OS_MASTER_VENDOR","$OS_MASTER_VENDOR_ARCH","$OS_MASTER_VENDOR_VERSION","$OS_VENDOR","$OS_VENDOR_ARCH","$OS_VENDOR_VERSION"}/*.sh \ | sed -e 's#/\([0-9][0-9]\)_#/!\1!_#g' | sort -t \! -k 2 | tr -d \! ) # This sed hack is neccessary to sort the scripts by their 2-digit number INSIDE indepentand of the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/lib/validated/SUSE_LINUX/10/x86_64.txt new/rear-1.10.0/usr/share/rear/lib/validated/SUSE_LINUX/10/x86_64.txt --- old/rear-1.9.0/usr/share/rear/lib/validated/SUSE_LINUX/10/x86_64.txt 2011-02-02 14:49:08.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/lib/validated/SUSE_LINUX/10/x86_64.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -Submitted: Gratien D'haese -Date: 2009-02-03 -Features: LVM, NETFS, ISO -Comment: out of the box diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/lib/validated/SUSE_LINUX/11/i386.txt new/rear-1.10.0/usr/share/rear/lib/validated/SUSE_LINUX/11/i386.txt --- old/rear-1.9.0/usr/share/rear/lib/validated/SUSE_LINUX/11/i386.txt 2011-02-02 14:49:08.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/lib/validated/SUSE_LINUX/11/i386.txt 2011-02-20 19:01:00.000000000 +0100 @@ -1,3 +1,3 @@ Submitted: Schlomo Schapiro -Date: 2009-12-09 -Features: NETFS, ISO, LVM, EMAIL +Date: 2011-02-20 +Features: NETFS, ISO, LVM, V2V diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/lib/validated/SUSE_LINUX/11/x86_64.txt new/rear-1.10.0/usr/share/rear/lib/validated/SUSE_LINUX/11/x86_64.txt --- old/rear-1.9.0/usr/share/rear/lib/validated/SUSE_LINUX/11/x86_64.txt 2011-02-02 14:49:08.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/lib/validated/SUSE_LINUX/11/x86_64.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -Submitted: Schlomo Schapiro -Date: 2009-12-09 -Features: NETFS, ISO, LVM, EMAIL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/lib/validated/SUSE_LINUX/11.2/x86_64.txt new/rear-1.10.0/usr/share/rear/lib/validated/SUSE_LINUX/11.2/x86_64.txt --- old/rear-1.9.0/usr/share/rear/lib/validated/SUSE_LINUX/11.2/x86_64.txt 2011-02-02 14:49:08.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/lib/validated/SUSE_LINUX/11.2/x86_64.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -Submitted: Schlomo Schapiro -Date: 2009-12-09 -Features: NETFS, ISO, LVM, EMAIL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/lib/validated/SUSE_LINUX/11.4/i386.txt new/rear-1.10.0/usr/share/rear/lib/validated/SUSE_LINUX/11.4/i386.txt --- old/rear-1.9.0/usr/share/rear/lib/validated/SUSE_LINUX/11.4/i386.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/lib/validated/SUSE_LINUX/11.4/i386.txt 2011-02-20 19:00:14.000000000 +0100 @@ -0,0 +1,3 @@ +Submitted: Schlomo Schapiro +Date: 2011-02-20 +Features: NETFS, ISO, LVM diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/output/ISO/Linux-i386/80_create_isofs.sh new/rear-1.10.0/usr/share/rear/output/ISO/Linux-i386/80_create_isofs.sh --- old/rear-1.9.0/usr/share/rear/output/ISO/Linux-i386/80_create_isofs.sh 2011-02-02 14:49:07.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/output/ISO/Linux-i386/80_create_isofs.sh 2011-02-16 22:05:10.000000000 +0100 @@ -27,13 +27,13 @@ test -d "$ISO_DIR" || mkdir -p "$ISO_DIR" 1>&8 ProgressStopIfError $? "Could not create ISO ouput directory ($ISO_DIR)" pushd $BUILD_DIR 1>&8 # so that relative paths will work -$ISO_MKISOFS_BIN -o "$ISO_DIR/$ISO_PREFIX.iso" -b isolinux.bin -c boot.cat \ +$ISO_MKISOFS_BIN -quiet -o "$ISO_DIR/$ISO_PREFIX.iso" -b isolinux.bin -c boot.cat \ -no-emul-boot -boot-load-size 4 -boot-info-table \ -R -J -volid "$ISO_VOLID" -v "${ISO_FILES[@]}" 1>&8 ProgressStopOrError $? "Could not create ISO image" ISO_IMAGES=( "${ISO_IMAGES[@]}" "$ISO_DIR/$ISO_PREFIX.iso" ) popd >/dev/null -Print "Wrote ISO Image $ISO_DIR/$ISO_PREFIX.iso ($(du -h "$ISO_DIR/$ISO_PREFIX.iso"| tr -s " \t" " " | cut -d " " -f 1))" +LogPrint "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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/output/ISO/Linux-x86_64 new/rear-1.10.0/usr/share/rear/output/ISO/Linux-x86_64 --- old/rear-1.9.0/usr/share/rear/output/ISO/Linux-x86_64 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/output/ISO/Linux-x86_64 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Linux-i386 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/output/OBDR/Linux-x86_64 new/rear-1.10.0/usr/share/rear/output/OBDR/Linux-x86_64 --- old/rear-1.9.0/usr/share/rear/output/OBDR/Linux-x86_64 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/output/OBDR/Linux-x86_64 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Linux-i386 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/output/OBDR/default/50_set_obdr_blocksize.sh new/rear-1.10.0/usr/share/rear/output/OBDR/default/50_set_obdr_blocksize.sh --- old/rear-1.9.0/usr/share/rear/output/OBDR/default/50_set_obdr_blocksize.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/output/OBDR/default/50_set_obdr_blocksize.sh 2011-02-16 20:23:49.000000000 +0100 @@ -0,0 +1,6 @@ +# set tape block size + +Log "Set tape block size to ${OBDR_BLOCKSIZE:-0}" +mt -f "${TAPE_DEVICE}" setblk ${OBDR_BLOCKSIZE:-0} +ProgressStopIfError $? "Problem with setting tape blocksize to ${OBDR_BLOCKSIZE:-0} on tape device ${TAPE_DEVICE}" +ProgressStep diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/output/OBDR/default/50_set_tape_blocksize.sh new/rear-1.10.0/usr/share/rear/output/OBDR/default/50_set_tape_blocksize.sh --- old/rear-1.9.0/usr/share/rear/output/OBDR/default/50_set_tape_blocksize.sh 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/output/OBDR/default/50_set_tape_blocksize.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to ../../../prep/TAPE/default/50_set_tape_blocksize.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/output/OBDR/default/81_write_image.sh new/rear-1.10.0/usr/share/rear/output/OBDR/default/81_write_image.sh --- old/rear-1.9.0/usr/share/rear/output/OBDR/default/81_write_image.sh 2011-02-02 14:49:07.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/output/OBDR/default/81_write_image.sh 2011-02-16 20:23:49.000000000 +0100 @@ -4,7 +4,7 @@ Error "The ISO image $ISO_DIR/$ISO_PREFIX.iso was not found or could not be read." fi -dd if=$ISO_DIR/$ISO_PREFIX.iso of=${TAPE_DEVICE} ${TAPE_BLOCKSIZE:+bs=$TAPE_BLOCKSIZE} +dd if=$ISO_DIR/$ISO_PREFIX.iso of=${TAPE_DEVICE} ${OBDR_BLOCKSIZE:+bs=$OBDR_BLOCKSIZE} ProgressStopIfError $? "ISO image could not be written to ${TAPE_DEVICE}" ProgressStep diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/output/USB/default/85_make_USB_bootable.sh new/rear-1.10.0/usr/share/rear/output/USB/default/85_make_USB_bootable.sh --- old/rear-1.9.0/usr/share/rear/output/USB/default/85_make_USB_bootable.sh 2011-02-02 14:49:07.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/output/USB/default/85_make_USB_bootable.sh 2011-02-16 20:23:49.000000000 +0100 @@ -1,10 +1,21 @@ +# Attempt to find the real USB device by trying its parent +# Return a proper short device name using udev +TEMP_USB_DEVICE=$(dirname $(my_udevinfo -q path -n "$USB_DEVICE")) +if [[ -d "/sys/$TEMP_USB_DEVICE" && "$TEMP_USB_DEVICE" =~ "^/block/" ]]; then + RAW_USB_DEVICE="/dev/$(my_udevinfo -q name -p "$TEMP_USB_DEVICE")" +else + RAW_USB_DEVICE="/dev/$(my_udevinfo -q name -n "$USB_DEVICE")" +fi + # Make the USB bootable -syslinux --stupid ${USB_DEVICE} -ProgressStopIfError $? "Problem with syslinux --stupid ${USB_DEVICE}" +syslinux $USB_DEVICE +ProgressStopIfError $? "Problem with syslinux $USB_DEVICE" ProgressStep + # Write the USB boot sector -dd if=$(dirname ${ISO_ISOLINUX_BIN})/mbr.bin of=`echo ${USB_DEVICE} | sed -e 's/[0-9]$//'` -ProgressStopIfError $? "Problem with writing the mbr.bin to `echo ${USB_DEVICE} | sed -e 's/[0-9]$//'`" +dd if=$(dirname $ISO_ISOLINUX_BIN)/mbr.bin of=$RAW_USB_DEVICE +ProgressStopIfError $? "Problem with writing the mbr.bin to $RAW_USB_DEVICE" ProgressStep + # Need to flush the buffer for the USB boot sector. sync; sync diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/pack/CentOS new/rear-1.10.0/usr/share/rear/pack/CentOS --- old/rear-1.9.0/usr/share/rear/pack/CentOS 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/pack/CentOS 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Fedora diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/pack/FedoraCore new/rear-1.10.0/usr/share/rear/pack/FedoraCore --- old/rear-1.9.0/usr/share/rear/pack/FedoraCore 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/pack/FedoraCore 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Fedora diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/pack/Linux-x86_64 new/rear-1.10.0/usr/share/rear/pack/Linux-x86_64 --- old/rear-1.9.0/usr/share/rear/pack/Linux-x86_64 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/pack/Linux-x86_64 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Linux-i386 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/pack/RedHatEnterpriseAS new/rear-1.10.0/usr/share/rear/pack/RedHatEnterpriseAS --- old/rear-1.9.0/usr/share/rear/pack/RedHatEnterpriseAS 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/pack/RedHatEnterpriseAS 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Fedora diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/pack/RedHatEnterpriseES new/rear-1.10.0/usr/share/rear/pack/RedHatEnterpriseES --- old/rear-1.9.0/usr/share/rear/pack/RedHatEnterpriseES 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/pack/RedHatEnterpriseES 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Fedora diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/pack/RedHatEnterpriseServer new/rear-1.10.0/usr/share/rear/pack/RedHatEnterpriseServer --- old/rear-1.9.0/usr/share/rear/pack/RedHatEnterpriseServer 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/pack/RedHatEnterpriseServer 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Fedora diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/pack/ScientificSL new/rear-1.10.0/usr/share/rear/pack/ScientificSL --- old/rear-1.9.0/usr/share/rear/pack/ScientificSL 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/pack/ScientificSL 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Fedora diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/pack/Ubuntu new/rear-1.10.0/usr/share/rear/pack/Ubuntu --- old/rear-1.9.0/usr/share/rear/pack/Ubuntu 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/pack/Ubuntu 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Debian diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/prep/GNU/Linux/21_include_dhclient.sh new/rear-1.10.0/usr/share/rear/prep/GNU/Linux/21_include_dhclient.sh --- old/rear-1.9.0/usr/share/rear/prep/GNU/Linux/21_include_dhclient.sh 2011-02-02 14:49:08.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/prep/GNU/Linux/21_include_dhclient.sh 2011-02-16 21:59:16.000000000 +0100 @@ -27,6 +27,7 @@ if [ $? -eq 0 ]; then # if we find a dhcp client being active we automatically # include DHCP CLIENT support in ReaR + Log "Running DHCP client found, enabling USE_DHCLIENT" USE_DHCLIENT=yes fi } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/prep/ISO/Linux-x86_64 new/rear-1.10.0/usr/share/rear/prep/ISO/Linux-x86_64 --- old/rear-1.9.0/usr/share/rear/prep/ISO/Linux-x86_64 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/prep/ISO/Linux-x86_64 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Linux-i386 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/prep/OBDR/Linux-x86_64 new/rear-1.10.0/usr/share/rear/prep/OBDR/Linux-x86_64 --- old/rear-1.9.0/usr/share/rear/prep/OBDR/Linux-x86_64 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/prep/OBDR/Linux-x86_64 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Linux-i386 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/prep/USB/Linux-x86_64 new/rear-1.10.0/usr/share/rear/prep/USB/Linux-x86_64 --- old/rear-1.9.0/usr/share/rear/prep/USB/Linux-x86_64 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/prep/USB/Linux-x86_64 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Linux-i386 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/recreate/Linux-x86_64 new/rear-1.10.0/usr/share/rear/recreate/Linux-x86_64 --- old/rear-1.9.0/usr/share/rear/recreate/Linux-x86_64 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/recreate/Linux-x86_64 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Linux-i386 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/rescue/default/01_merge_skeletons.sh new/rear-1.10.0/usr/share/rear/rescue/default/01_merge_skeletons.sh --- old/rear-1.9.0/usr/share/rear/rescue/default/01_merge_skeletons.sh 2011-02-02 14:49:04.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/rescue/default/01_merge_skeletons.sh 2011-02-16 22:47:45.000000000 +0100 @@ -20,8 +20,14 @@ ProgressStart "Creating root FS layout" pushd $SHARE_DIR/skel >/dev/null -for dir in default "$ARCH" "$OS" "$OS_VENDOR/default" "$OS_VENDOR_ARCH" "$OS_VENDOR_VERSION" "$BACKUP" "$OUTPUT" ; do - if test -s "$dir".tar.gz ; then +for dir in default "$ARCH" "$OS" \ + "$OS_MASTER_VENDOR/default" "$OS_MASTER_VENDOR_ARCH" "$OS_MASTER_VENDOR_VERSION" \ + "$OS_VENDOR/default" "$OS_VENDOR_ARCH" "$OS_VENDOR_VERSION" \ + "$BACKUP" "$OUTPUT" ; do + if test -z "$dir" ; then + # silently skip if $dir it empty, e.g. if OS_MASTER_* is empty + continue + elif test -s "$dir".tar.gz ; then Log "Adding '$dir.tar.gz'" tar -C $ROOTFS_DIR -xvzf "$dir".tar.gz 1>&8 elif test -d "$dir" ; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/restore/CentOS new/rear-1.10.0/usr/share/rear/restore/CentOS --- old/rear-1.9.0/usr/share/rear/restore/CentOS 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/restore/CentOS 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Fedora diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/restore/FedoraCore new/rear-1.10.0/usr/share/rear/restore/FedoraCore --- old/rear-1.9.0/usr/share/rear/restore/FedoraCore 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/restore/FedoraCore 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Fedora diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/restore/RedHatEnterpriseAS new/rear-1.10.0/usr/share/rear/restore/RedHatEnterpriseAS --- old/rear-1.9.0/usr/share/rear/restore/RedHatEnterpriseAS 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/restore/RedHatEnterpriseAS 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Fedora diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/restore/RedHatEnterpriseES new/rear-1.10.0/usr/share/rear/restore/RedHatEnterpriseES --- old/rear-1.9.0/usr/share/rear/restore/RedHatEnterpriseES 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/restore/RedHatEnterpriseES 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Fedora diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/restore/RedHatEnterpriseServer new/rear-1.10.0/usr/share/rear/restore/RedHatEnterpriseServer --- old/rear-1.9.0/usr/share/rear/restore/RedHatEnterpriseServer 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/restore/RedHatEnterpriseServer 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Fedora diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/restore/ScientificSL new/rear-1.10.0/usr/share/rear/restore/ScientificSL --- old/rear-1.9.0/usr/share/rear/restore/ScientificSL 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/restore/ScientificSL 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Fedora diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/skel/CentOS new/rear-1.10.0/usr/share/rear/skel/CentOS --- old/rear-1.9.0/usr/share/rear/skel/CentOS 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/skel/CentOS 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Fedora Files old/rear-1.9.0/usr/share/rear/skel/Debian/default.tar.gz and new/rear-1.10.0/usr/share/rear/skel/Debian/default.tar.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/skel/Fedora/5/etc/scripts/run-syslog new/rear-1.10.0/usr/share/rear/skel/Fedora/5/etc/scripts/run-syslog --- old/rear-1.9.0/usr/share/rear/skel/Fedora/5/etc/scripts/run-syslog 1970-01-01 01:00:00.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/skel/Fedora/5/etc/scripts/run-syslog 2011-02-16 21:25:20.000000000 +0100 @@ -0,0 +1,15 @@ +#!/bin/bash + +# run a syslog daemon +# special version to support rsyslog 2.x on RHEL 5 + +if type -p rsyslogd >/dev/null ; then + exec rsyslogd -n -i /var/run/rsyslogd.pid -f /etc/rsyslog.conf +else + klogd -c 1 -x + if type -p syslog-ng >/dev/null ; then + exec syslog-ng -p /var/run/syslog-ng.pid -f /etc/syslog-ng.conf -F + else + exec syslogd -f /etc/syslog.conf -n + fi +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/skel/Fedora/5.1 new/rear-1.10.0/usr/share/rear/skel/Fedora/5.1 --- old/rear-1.9.0/usr/share/rear/skel/Fedora/5.1 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/skel/Fedora/5.1 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to 5.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/skel/Fedora/5.2 new/rear-1.10.0/usr/share/rear/skel/Fedora/5.2 --- old/rear-1.9.0/usr/share/rear/skel/Fedora/5.2 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/skel/Fedora/5.2 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to 5.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/skel/Fedora/5.3 new/rear-1.10.0/usr/share/rear/skel/Fedora/5.3 --- old/rear-1.9.0/usr/share/rear/skel/Fedora/5.3 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/skel/Fedora/5.3 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to 5.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/skel/Fedora/5.4/etc/scripts/run-syslog new/rear-1.10.0/usr/share/rear/skel/Fedora/5.4/etc/scripts/run-syslog --- old/rear-1.9.0/usr/share/rear/skel/Fedora/5.4/etc/scripts/run-syslog 2011-02-02 14:49:06.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/skel/Fedora/5.4/etc/scripts/run-syslog 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -#!/bin/bash - -# run a syslog daemon -# special version to support rsyslog 2.x on RHEL 5 - -if type -p rsyslogd >/dev/null ; then - exec rsyslogd -n -i /var/run/rsyslogd.pid -f /etc/rsyslog.conf -else - klogd -c 1 -x - if type -p syslog-ng >/dev/null ; then - exec syslog-ng -p /var/run/syslog-ng.pid -f /etc/syslog-ng.conf -F - else - exec syslogd -f /etc/syslog.conf -n - fi -fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/skel/FedoraCore new/rear-1.10.0/usr/share/rear/skel/FedoraCore --- old/rear-1.9.0/usr/share/rear/skel/FedoraCore 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/skel/FedoraCore 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Fedora diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/skel/LinuxMint new/rear-1.10.0/usr/share/rear/skel/LinuxMint --- old/rear-1.9.0/usr/share/rear/skel/LinuxMint 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/skel/LinuxMint 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Ubuntu diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/skel/RedHatEnterpriseAS new/rear-1.10.0/usr/share/rear/skel/RedHatEnterpriseAS --- old/rear-1.9.0/usr/share/rear/skel/RedHatEnterpriseAS 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/skel/RedHatEnterpriseAS 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Fedora diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/skel/RedHatEnterpriseES new/rear-1.10.0/usr/share/rear/skel/RedHatEnterpriseES --- old/rear-1.9.0/usr/share/rear/skel/RedHatEnterpriseES 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/skel/RedHatEnterpriseES 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Fedora diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/skel/RedHatEnterpriseServer new/rear-1.10.0/usr/share/rear/skel/RedHatEnterpriseServer --- old/rear-1.9.0/usr/share/rear/skel/RedHatEnterpriseServer 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/skel/RedHatEnterpriseServer 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Fedora diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/skel/ScientificSL new/rear-1.10.0/usr/share/rear/skel/ScientificSL --- old/rear-1.9.0/usr/share/rear/skel/ScientificSL 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/skel/ScientificSL 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Fedora Files old/rear-1.9.0/usr/share/rear/skel/Ubuntu/default.tar.gz and new/rear-1.10.0/usr/share/rear/skel/Ubuntu/default.tar.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rear-1.9.0/usr/share/rear/verify/Linux-x86_64 new/rear-1.10.0/usr/share/rear/verify/Linux-x86_64 --- old/rear-1.9.0/usr/share/rear/verify/Linux-x86_64 2011-02-21 00:23:03.000000000 +0100 +++ new/rear-1.10.0/usr/share/rear/verify/Linux-x86_64 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to Linux-i386 ++++++ rear.dsc ++++++ --- /var/tmp/diff_new_pack.TwAeWp/_old 2011-02-21 00:23:03.000000000 +0100 +++ /var/tmp/diff_new_pack.TwAeWp/_new 2011-02-21 00:23:03.000000000 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: rear -Version: 1.9.0 +Version: 1.10.0 Binary: rear Maintainer: Schlomo Schapiro <[email protected]> Architecture: all ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
