Changeset 542


Ignore:
Timestamp:
May 13, 2006, 8:48:41 PM (13 years ago)
Author:
bcornec
Message:

merge -r436:517 $SVN_M/branches/2.0.7
stable is now again at 2.0.8 initial

Location:
branches/stable
Files:
17 edited
2 copied

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi/ChangeLog

    r427 r542  
    33MINDI CHANGES
    44
    5 1.07 (2006-02-23)
     51.0.7 (2006-03-10)
     6- Fix issue for 2.6 kernels with VIA chipsets (Andree Leidenfrost)
    67- stop creating further size of floppy disks if the smaller one succeeds
    78  (Bruno Cornec)
  • branches/stable/mindi/VERSION

    r339 r542  
    1 stable
     11.0.7
  • branches/stable/mindi/distributions/redhat/spec.m4

    r541 r542  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', %{name}-%{version}.tgz)dnl
     4define(`SSS', ftp://ftp.mondorescue.org/src/%{name}-%{version}.tgz)dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    66define(`DDD', %{addreqb}, which, grep >= 2.5)dnl
    77dnl GRP is replaced by the RPM group of apps
    8 define(`GRP', Archiving/Archiving)dnl
     8define(`GRP', Applications/Archiving)dnl
  • branches/stable/mindi/distributions/rpm/mindi.spec

    r541 r542  
    1717License:    GPL
    1818Group:      %{grp}
    19 Url:        http://mondorescue.berlios.de
     19Url:        http://www.mondorescue.org
    2020Source:     %{src}
    21 BuildRoot:  %{_tmppath}/%{name}-%{version}
     21BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
    2222Requires:   %{addreq}
     23Epoch:      %(echo EEE | cut -d- -f1 | sed "s~M~~")
    2324# Not on all systems
    2425#Conflicts: bonnie++
     
    3132
    3233%prep
    33 %{__rm}  -rf $RPM_BUILD_ROOT
    3434%setup -n %name-%{version}
    3535
     
    4141
    4242%install
     43%{__rm}  -rf $RPM_BUILD_ROOT
    4344export DONT_RELINK=1
    4445
    45 %{__rm} -rf $RPM_BUILD_ROOT
    4646export PREFIX=${RPM_BUILD_ROOT}%{_exec_prefix}
    4747export CONFDIR=${RPM_BUILD_ROOT}%{_sysconfdir}
     
    6060%files
    6161%defattr(644,root,root,755)
    62 %config(noreplace) %{_sysconfdir}/mindi/deplist.txt
     62%config(noreplace) %{_sysconfdir}/mindi
     63%config(noreplace) %{_sysconfdir}/mindi/deplist.txt
    6364%doc ChangeLog INSTALL COPYING README TODO README.ia64 README.pxe README.busybox svn.log
    6465%{_mandir}/man8/*
  • branches/stable/mindi/install.sh

    r541 r542  
    109109fi
    110110
     111# Special case for SuSE family where doc is put elsewhere in the RPM
     112if [ _"$dfam" = _"suse" ]; then
     113    rm -rf $DOCDIR
     114fi
     115
    111116exit 0
  • branches/stable/mindi/mindi

    r541 r542  
    12541254    if [ $tmpmodprobe_flag == "Y" ] ; then
    12551255        infile="/tmp/modprobe.conf.mindi.$$"
    1256         find /etc/modprobe.d -maxdepth 1 -name "*" -xtype f > $infile
     1256        find /etc/modprobe.d -maxdepth 1 -name "*" -xtype f -print0 | xargs -0 cat > $infile
    12571257    else
    12581258        infile="/etc/modules.conf"
     
    13151315    if [ -d "/proc/lvm" ] || [ -d "/dev/mapper" ]; then
    13161316    echo -en "\rAnalyzing LVM...\r"
    1317     all_partitions=`$MINDI_LIB/analyze-my-lvm | fgrep ">>>" | cut -d' ' -f2-32`
     1317    all_partitions=`$MINDI_SBIN/analyze-my-lvm | fgrep ">>>" | cut -d' ' -f2-32`
    13181318    fi
    13191319    all_partitions="$all_partitions `ListAllPartitions 2> /dev/null`"
     
    22172217    cp -f $TMP_ROOT/mountlist.txt $CACHE_LOC
    22182218    [ "`DidMondoCallMe`" ] && cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MONDO_TMP/.
    2219     [ -d "/proc/lvm" ] && $MINDI_LIB/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
    2220     [ -d "/dev/mapper" ] && $MINDI_LIB/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
     2219    [ -d "/proc/lvm" ] && $MINDI_SBIN/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
     2220    [ -d "/dev/mapper" ] && $MINDI_SBIN/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
    22212221    cat $minidir_root/$noof_disks/tmp/mountlist.txt >> $LOGFILE
    22222222    ZipMinidirsIntoTarballs $minidir_root $tardir $noof_disks
  • branches/stable/mondo/ChangeLog

    r541 r542  
    33MONDO CHANGES
    44
    5 v2.07 (2006-02-23)
     52.0.7 (2006-03-10)
    66- useless cat, sort|uniq commands removed
    77  (Bruno Cornec/Sébastien Aperghis-Tramoni)
  • branches/stable/mondo/VERSION

    r339 r542  
    1 stable
     12.0.7
  • branches/stable/mondo/distributions/mandriva/spec.m4

    r541 r542  
    77dnl GRP is replaced by the RPM group of apps
    88define(`GRP', `Archiving/Backup')dnl
     9dnl OBS is replaced vy what is being obsoleted
     10define(`OBS', Obsoletes:    libmondo <= 2.04)dnl
  • branches/stable/mondo/distributions/redhat/spec.m4

    r541 r542  
    77dnl GRP is replaced by the RPM group of apps
    88define(`GRP', Archiving/Archiving)dnl
     9dnl OBS is replaced vy what is being obsoleted
     10define(`OBS', )dnl
  • branches/stable/mondo/distributions/rpm/mondo.spec

    r541 r542  
    1010%define src     SSS
    1111%define grp     GRP
    12 %define addreqb mindi >= 1.05, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, slang >= 1.4.1
     12%define addreqb mindi >= 1.0.7, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, slang >= 1.4.1
    1313%define addreq  DDD
    1414%define rel     %{mrel}
    1515
    1616Summary:    A program which a Linux user can utilize to create a rescue/restore CD/tape
    17 Summary(fr):    Un programme pour les utilisateurs de Linux pour cr�r un CD/tape de sauvegarde/restauration
     17Summary(fr):    Un programme pour les utilisateurs de Linux pour créer un CD/tape de sauvegarde/restauration
    1818Summary(it):    Un programma per utenti Linux per creare un CD/tape di rescue
    1919Summary(sp):    Un programa para los usuarios de Linux por crear una CD/cinta de restoracion/rescate
     
    2828BuildRoot:  %{_tmppath}/%{name}-%{version}
    2929BuildRequires:  newt-devel >= 0.50, slang-devel >= 1.4.1, gcc
     30Epoch:      %(echo EEE | cut -d- -f1 | sed "s~M~~")
     31OBS
    3032%ifarch ia64
    3133Requires:   %{addreq}, elilo, parted
     
    6668
    6769%build
    68 %configure
     70%configure --program-prefix=%{?_program_prefix}
    6971%{__make} VERSION=%{version}
    7072
  • branches/stable/mondo/distributions/suse/spec.m4

    r541 r542  
    77dnl GRP is replaced by the RPM group of apps
    88define(`GRP', Productivity/Archiving/Backup)dnl
     9dnl OBS is replaced vy what is being obsoleted
     10define(`OBS', )dnl
  • branches/stable/mondo/mondo/common/my-stuff.h

    r541 r542  
    345345 * @c growisofs command to generate a bootable DVD using isolinux, except for the directory to image.
    346346 */
    347 #define MONDO_GROWISOFS_REGULAR_SYSLINUX "growisofs -speed=1 -use-the-force-luke -J -no-emul-boot -boot-load-size 4 -b isolinux.bin --boot-info-table -c boot.cat -boot-load-size 4 -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_ -v"
     347#define MONDO_GROWISOFS_REGULAR_SYSLINUX "growisofs -use-the-force-luke -J -no-emul-boot -boot-load-size 4 -b isolinux.bin --boot-info-table -c boot.cat -boot-load-size 4 -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_ -v"
    348348
    349349/**
    350350 * @c growisofs command to generate a bootable DVD using LILO, except for the directory to image.
    351351     */// -b images/mindi-boot.2880.img
    352 #define MONDO_GROWISOFS_REGULAR_ELILO     "growisofs -speed=1 -use-the-force-luke -no-emul-boot -b images/mindi-boot.2880.img -c boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
     352#define MONDO_GROWISOFS_REGULAR_ELILO     "growisofs -use-the-force-luke -no-emul-boot -b images/mindi-boot.2880.img -c boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
    353353
    354354/**
    355355 * @c growisofs command to generate a bootable DVD using LILO, except for the directory to image.
    356356     */// -b images/mindi-boot.2880.img
    357 #define MONDO_GROWISOFS_REGULAR_LILO     "growisofs -speed=1 -no-emul-boot -b isolinux.bin -c boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
     357#define MONDO_GROWISOFS_REGULAR_LILO     "growisofs -no-emul-boot -b isolinux.bin -c boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
    358358
    359359/**
    360360 * @c growisofs command to generate a nonbootable DVD, except for the directory to image.
    361361 */
    362 #define MONDO_GROWISOFS_NONBOOT          "growisofs -speed=1 -use-the-force-luke -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
     362#define MONDO_GROWISOFS_NONBOOT          "growisofs -use-the-force-luke -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
    363363
    364364/**
  • branches/stable/mondo/mondo/mondoarchive/mondo-cli.c

    r541 r542  
    356356    /*@ buffers ** */
    357357    char *tmp;
     358    char *tmp1;
    358359    char *psz;
    359360
     
    442443            strcat(bkpinfo->include_paths, " ");
    443444        }
    444         if (stat(flag_val['I'], &buf) != 0) {
    445             log_msg(1, "ERROR ! %s doesn't exist", flag_val['I']);
    446             fatal_error("ERROR ! You specified a directory to include which doesn't exist");
    447         }
     445        asprintf(&tmp1, flag_val['I']);
     446        char *p = tmp1;
     447        char *q = tmp1;
     448
     449        /* Cut the flag_val['I'] in parts containing all paths to test them */
     450        while (p != NULL) {
     451            q = strchr(p, ' ');
     452            if (q != NULL) {
     453                *q = '\0';
     454                p = q+1 ;
     455                if (stat(p, &buf) != 0) {
     456                    log_msg(1, "ERROR ! %s doesn't exist", p);
     457                    fatal_error("ERROR ! You specified a directory to include which doesn't exist");
     458                }
     459            } else {
     460                if (stat(p, &buf) != 0) {
     461                    log_msg(1, "ERROR ! %s doesn't exist", p);
     462                    fatal_error("ERROR ! You specified a directory to include which doesn't exist");
     463                }
     464                p = NULL;
     465            }
     466        }
     467        paranoid_free(tmp1);
     468
    448469        strncpy(bkpinfo->include_paths + strlen(bkpinfo->include_paths),
    449470                flag_val['I'],
     
    659680            strcat(bkpinfo->exclude_paths, " ");
    660681        }
    661         if (stat(flag_val['E'], &buf) != 0) {
    662             log_msg(1, "WARNING ! %s doesn't exist", flag_val['E']);
    663         }
     682        asprintf(&tmp1, flag_val['E']);
     683        char *p = tmp1;
     684        char *q = tmp1;
     685
     686        /* Cut the flag_val['E'] in parts containing all paths to test them */
     687        while (p != NULL) {
     688            q = strchr(p, ' ');
     689            if (q != NULL) {
     690                *q = '\0';
     691                p = q+1 ;
     692                if (stat(p, &buf) != 0) {
     693                    log_msg(1, "WARNING ! %s doesn't exist", p);
     694                }
     695            } else {
     696                if (stat(p, &buf) != 0) {
     697                    log_msg(1, "WARNING ! %s doesn't exist", p);
     698                }
     699                p = NULL;
     700            }
     701        }
     702        paranoid_free(tmp1);
     703
    664704        strncpy(bkpinfo->exclude_paths + strlen(bkpinfo->exclude_paths),
    665705                flag_val['E'],
  • branches/stable/tools/mkdeliv

    r541 r542  
    88# BerliOS FTP/SSH setup
    99ACCOUNT=bruno@ftp.mondorescue.org
    10 DSTDIR=/
     10DSTDIR=/mondo/ftp
    1111FTPSERV="ftp.berlios.de"
    1212FTPDIR="/incoming"
  • branches/stable/tools/mkspec

    r541 r542  
    1212if [ -f ${dir}/../$ddir/spec.m4 ]; then
    1313    inc=${dir}/../$ddir/spec.m4
    14 elif [ -f ${dir}/../$ddmir/spec.m4 ]; then
    15     inc=${dir}/../$ddmir/spec.m4
     14elif [ -f ${dir}/../$dfam/spec.m4 ]; then
     15    inc=${dir}/../$dfam/spec.m4
    1616else
    1717    echo "Unable to build RPM for this distro. Please report to authors"
     
    2525cat >> /tmp/mondorescue.mc << EOF
    2626define(\`RRR', ${REVISION}${suf})dnl
     27define(\`EEE', ${REVISION})dnl
    2728define(\`VVV', ${1})dnl
    2829EOF
  • branches/stable/tools/rpm-env

    r541 r542  
    5656        export ddir="redhat"
    5757        dver=`awk '{print $5}' /etc/redhat-release`
     58        export dver=`echo ${dver} | sed "s/\.//"`
    5859        export suf=".rh${dver}"
    59         export dver=`echo ${dver} | sed "s/\.//"`
    6060    fi
    6161elif [ -e /etc/SuSE-release ]; then
Note: See TracChangeset for help on using the changeset viewer.