Changeset 756 for branches/2.0.9


Ignore:
Timestamp:
Aug 7, 2006, 1:16:48 AM (13 years ago)
Author:
bruno
Message:

merge -r754:755 $SVN_M/branches/stable

Location:
branches/2.0.9
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • branches/2.0.9/mindi/mindi

    r748 r756  
    14321432        # the former is then a link to the latter, so we test whether
    14331433        # $current_partition is actually such a link or not and set
    1434         # $current_lvolume accordingly. Note that $current_lvolume may well be an
     1434        # $current_lvolume accordingly. On Debian you may find more than one answer
     1435        # so we remove the one corresponding to /dev/.static
     1436        # On RedHat even if the device name is different (/dev/mapper/<VG><LV>), the
     1437        # principle is the same and we need to find the link to it as well.
     1438        # Note that $current_lvolume may well be an
    14351439        # ordinary device. It is just to make sure that we feed the right value
    14361440        # into any of the LVM tools if possible.
    14371441
    14381442        current_lvolume="$current_partition"
    1439         if [ $LVM = "v2" ] && [ "`$LVMCMD lvdisplay $current_partition 2> /dev/null`" ]; then
    1440             partition_stub="`echo "$current_partition" | sed "s|^/dev/mapper/|/dev/|" | cut -d"-" -f1`"
    1441             current_lvolume="`find /dev -lname "$current_partition" | grep "^$partition_stub"`"
    1442         fi
    1443         #
    1444         # For ReHat lvmdisplay doesn't work on /dev/mapper entries
    1445         #
    14461443        if [ $LVM = "v2" ] && [ "`echo $current_partition | grep '/dev/mapper/'`" ]; then
    1447             current_lvolume="`find /dev -lname "$current_partition"`"
     1444            # .static dir are a Debian specificity
     1445            current_lvolume="`find /dev -lname "$current_partition" | grep -v /.static/`"
     1446            echo $current_lvolume | grep -q ' '
     1447            if [ $? -eq 0]; then
     1448                echo "WARNING: Multiple Logical Volumes found. Report to dev team" >> $LOGFILE 
     1449            fi
    14481450        fi
    14491451        #
  • branches/2.0.9/mondo-doc/distributions/rpm/mondo-doc.spec

    r722 r756  
    3232%install
    3333%{__rm} -rf $RPM_BUILD_ROOT
    34 %{__make} -f Makefile.man install INSTALLDIR=${RPM_BUILD_ROOT}/${RPM_DOC_DIR}/%{name}-%{version}
    35 %{__make} -f Makefile.howto install INSTALLDIR=${RPM_BUILD_ROOT}/${RPM_DOC_DIR}/%{name}-%{version}
     34%{__make} -f Makefile.man install INSTALLDIR=${RPM_BUILD_ROOT}/%{_defaultdocdir}/%{name}-%{version}
     35%{__make} -f Makefile.howto install INSTALLDIR=${RPM_BUILD_ROOT}/%{_defaultdocdir}/%{name}-%{version}
    3636
    3737%clean
     
    4040%files
    4141%defattr(-,root,root)
    42 %doc svn.log
    43 %doc mindi.8 mondoarchive.8 mondorestore.8
    44 %doc mindi.8.html mindi.8.txt mindi.8.ps mindi.8.pdf
    45 %doc mondoarchive.8.html mondoarchive.8.txt mondoarchive.8.ps mondoarchive.8.pdf
    46 %doc mondorestore.8.html mondorestore.8.txt mondorestore.8.ps mondorestore.8.pdf
    47 %doc mondorescue-howto.html mondorescue-howto.pdf mondorescue-howto.ps mondorescue-howto.rtf mondorescue-howto.txt mondorescue-howto/ images/
     42%doc %{_defaultdocdir}/%{name}-%{version}
    4843
    4944%changelog
  • branches/2.0.9/mondo/mondo/common/libmondo-files.c

    r737 r756  
    12141214
    12151215    /*@ buffers ******** */
    1216     char outfile[MAX_STR_LEN];
    12171216    char nfs_dev[MAX_STR_LEN];
    12181217    char nfs_mount[MAX_STR_LEN];
     
    12271226    /*@ pointers ***** */
    12281227    char *p;
    1229     FILE *fout;
    1230 
    1231 
    12321228
    12331229    log_it("Storing NFS configuration");
  • branches/2.0.9/tools/build2pkg

    r754 r756  
    88#
    99
    10 umask 022
     10exec > /tmp/build2pkg.log 2>&1
     11
    1112dname=`dirname $0`
    1213prem=`echo $dname |cut -c1`
     
    9899    elif [  _"$dtype" = _"ebuild" ]; then
    99100        log=$TMP/$p-gentoo.log
    100         tar xfz $src $p-${PVER}/distributions/${ddir}-$dver/$p-${VER}.ebuild
     101        tar xfz $src $p-${PVER}/distributions/${ddir}-$dver/$p-${PVER}.ebuild
    101102        if [ _"`grep $TOPBUILDDIR/portage /etc/make.conf`" = _"" ]; then
    102103            echo "Adding $TOPBUILDDIR/portage to /etc/make.conf"
  • branches/2.0.9/tools/build2qemu

    r721 r756  
    1313# Syntax: build2qemu [version-tag [vm1]..|vmx]]
    1414
    15 umask 022
     15exec > /tmp/build2qemu.log 2>&1
     16
    1617dname=`dirname $0`
    1718prem=`echo $dname |cut -c1`
     
    8283        sleep 300
    8384    fi
    84     scp -P $sp $TMP/mkmondo.tar.gz bruno@localhost:
     85    scp -P $sp $TMP/mkmondo.tar.gz ~/.rpmmacros ~/.rpmrc bruno@localhost:
    8586    rdate=`date "+%m%d%H%M"`
    8687    ssh -p $sp root@localhost "date $rdate"
  • branches/2.0.9/tools/common-env

    r727 r756  
    1111mkdir -p ${TOPDIR}
    1212export TMPDIR=/tmp
    13 export TMP=`mktemp -d`
     13export TMP=`mktemp -d tmp.XXXXXXXXXX`
    1414
    1515umask 022
  • branches/2.0.9/tools/file2ftp

    r590 r756  
    55# $Id$
    66#
     7
     8exec > /tmp/file2ftp.log 2>&1
    79
    810dname=`dirname $0`
  • branches/2.0.9/tools/pkg2ftp

    r721 r756  
    55# $Id$
    66#
     7
     8exec > /tmp/pkg2ftp.log 2>&1
    79
    810dname=`dirname $0`
     
    5961        spkg="$spkg ${TOPBUILDDIR}/SRPMS/$pv${suf}.src.rpm"
    6062    elif [  _"$dtype" = "_deb" ]; then
    61         pkg="$pkg ${TOPBUILDDIR}/$p_*.rpm"
     63        pkg="$pkg ${TOPBUILDDIR}/$p_*.deb"
    6264        spkg="$spkg ${TOPBUILDDIR}/$p_*.dsc ${TOPBUILDDIR}/$p_*.tar.gz"
    6365    fi
  • branches/2.0.9/tools/pkg2mdv

    r627 r756  
    55# $Id$
    66#
     7
     8exec > /tmp/pkg2mdv.log 2>&1
    79
    810dname=`dirname $0`
  • branches/2.0.9/tools/svn2build

    r754 r756  
    55# $Id$
    66#
     7
     8exec > /tmp/svn2build.log 2>&1
    79
    810dname=`dirname $0`
     
    136138    # Finally creates the tar files
    137139    echo "Creating $p tar files"
    138     tar cfphz ${DEST}/$p-$v-$TAG.tar.gz $dest
     140    tar cfphz ${DEST}/$p-$v.tar.gz $dest
    139141    #gzip -cd ${DEST}/$p-$v-$TAG.tar.gz | bzip2 -c3 > ${DEST}/$p-$v-$TAG.tar.bz2
    140142    #tar cfhj ${DEST}/$p-$v-$TAG.tar.bz2 $dest
Note: See TracChangeset for help on using the changeset viewer.