Changeset 394 for trunk


Ignore:
Timestamp:
Feb 15, 2006, 11:44:31 AM (14 years ago)
Author:
bcornec
Message:

merge -r387:391 $SVN_M/branches/stable

Location:
trunk
Files:
2 deleted
7 edited
12 copied

Legend:

Unmodified
Added
Removed
  • trunk/documentation/mondorescue-howto.sgml

    r350 r394  
    44
    55<!ENTITY WWWB "http://www.mondorescue.org/">
    6 <!ENTITY WWW '<ulink url=&WWWB;>MondoRescue</ulink>'>
     6<!ENTITY WWW '<ulink url="http://www.mondorescue.org">MondoRescue</ulink>'>
    77<!ENTITY ML '<ulink url="http://lists.sourceforge.net/lists/listinfo/mondo-devel">mondorescue mailing list</ulink>'>
    88<!ENTITY gfdl SYSTEM "fdl.sgml">
     
    13711371        to work, please refer to the file README.pxe provided with
    13721372        your mindi package.
     1373</para>
    13731374</sect2>
    13741375</sect1>
     
    22672268see what you're kernel must support.</para>
    22682269</answer>
     2270</qandaentry>
     2271<qandaentry>
    22692272<question>
    22702273<para><anchor id="COPYBOOTDATADISK"/>Q: How do i copy boot+data
  • trunk/tools/mkcommon

    r340 r394  
    2222    rm -fr mindi-kernel-${MINDI_VER}
    2323    svn export ${VER}/mindi-kernel mindi-kernel-${MINDI_VER}
    24     #cp -a ${VER}/mindi-kernel mindi-kernel-${MINDI_VER}
    25     #find mindi-kernel-${MINDI_VER} -type d -name .svn | xargs rm -rf
    26     #find mindi-kernel-${MINDI_VER} -type f -name '.*.swp' | xargs rm -rf
    27     #find mindi-kernel-${MINDI_VER} -type f -name '*~' | xargs rm -rf
    2824    mkdir -p ${TOPDIR}/SOURCES
    2925
     
    3733    rm -fr mindi-${MINDI_VER}
    3834    svn export ${VER}/mindi mindi-${MINDI_VER}
    39     #cp -a ${VER}/mindi mindi-${MINDI_VER}
    4035    cp -a /tmp/mondorescue-svn.log mindi-${MINDI_VER}/svn.log
    4136    echo "$REVISION" > mindi-${MINDI_VER}/REVISION
    42     #find mindi-${MINDI_VER} -type d -name .svn | xargs rm -rf
    43     #find mindi-${MINDI_VER} -type f -name '.*.swp' | xargs rm -rf
    44     #find mindi-${MINDI_VER} -type f -name '*~' | xargs rm -rf
    4537    rm -f mindi-${MINDI_VER}/rootfs/sbin/parted2fdisk-ia64
    46     #rm -f mindi-${MINDI_VER}/parted2fdisk mindi-${MINDI_VER}/parted2fdisk.c mindi-${MINDI_VER}/rootfs/sbin/parted2fdisk-ia64
    4738
    4839    echo "Creating mindi tar files"
     
    5647    rm -rf mondo-${MONDO_VER}
    5748    svn export ${VER}/mondo mondo-${MONDO_VER}
    58     #cp -a ${VER}/mondo mondo-${MONDO_VER}
    5949    cp -a /tmp/mondorescue-svn.log mondo-${MONDO_VER}/svn.log
    6050    echo "$REVISION" > mondo-${MONDO_VER}/REVISION
     
    6353    cd documentation-${MONDO_VER}
    6454    make install INSTALLDIR=../mondo-${MONDO_VER}/mondo/docs/en
     55    if [ $? != 0 ]; then
     56        exit -1
     57    fi
    6558    cd ../mondo-${MONDO_VER}
    6659    echo "Bootstraping mondo ... "
    6760    ./bootstrap
    68     #find . -type d -name .svn | xargs rm -rf
    69     #find . -type f -name '.*.swp' | xargs rm -rf
    70     #find . -type f -name '*~' | xargs rm -rf
    7161    cd ..
    7262
  • trunk/tools/mkrpm

    r320 r394  
    2828    cd ${BASE}/svn
    2929    mkdir -p ${TOPDIR}/SOURCES
    30     sed "s/^%define mrel..*RRR/%define mrel ${REVISION}${suf}/" mindi-kernel-${MINDI_VER}/mindi-kernel.spec > ${TOPDIR}/SPECS/mindi-kernel.spec
     30    $TOOLHOME/mkspec ${MINDI_VER} mindi-kernel-${MINDI_VER}/mindi-kernel.spec > ${TOPDIR}/SPECS/mindi-kernel.spec
    3131    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-kernel-${MINDI_VER}-${REVISION}${suf}.${ARCH}.rpm"
    3232fi
    3333if [ "`echo $c | grep -v kernel | grep mindi`" != "" ]; then
    3434    cd ${BASE}/svn
    35     if [ -f mindi-${MINDI_VER}/distributions/${ddir}/mindi.spec ]; then
    36         specfile=mindi-${MINDI_VER}/distributions/${ddir}/mindi.spec
    37     else
    38         specfile=mindi-${MINDI_VER}/distributions/common/mindi.spec
    39     fi
    40     sed -e "s/^%define mrel..*RRR/%define mrel  ${REVISION}${suf}/" -e "s/VVV/${MINDI_VER}/" $specfile > ${TOPDIR}/SPECS/mindi.spec
     35    $TOOLHOME/mkspec ${MINDI_VER} mindi-${MINDI_VER}/distributions/rpm/mindi.spec > ${TOPDIR}/SPECS/mindi.spec
    4136    rm -rf mindi-${MINDI_VER}/distributions
    4237    mkdir -p ${TOPDIR}/SOURCES
     
    4843if [ "`echo $c | grep  mondo`" != "" ]; then
    4944    cd ${BASE}/svn
    50     if [ -f mondo-${MONDO_VER}/distributions/${ddir}/mondo.spec ]; then
    51         specfile=mondo-${MONDO_VER}/distributions/${ddir}/mondo.spec
    52     else
    53         specfile=mondo-${MONDO_VER}/distributions/common/mondo.spec
    54     fi
    55     sed -e "s/^%define mrel..*RRR/%define mrel  ${REVISION}${suf}/" -e "s/VVV/${MONDO_VER}/" $specfile > ${TOPDIR}/SPECS/mondo.spec
     45    $TOOLHOME/mkspec ${MONDO_VER} mondo-${MONDO_VER}/distributions/rpm/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
    5646    rm -rf mondo-${MONDO_VER}/distributions
    5747
  • trunk/tools/rpm-env

    r357 r394  
    3333
    3434if [ -e /etc/mandriva-release ]; then
     35    export dfam="mandriva"
    3536    export ddir="mandriva"
    3637    export dver=`awk '{print $4}' /etc/mandriva-release`
    3738    export suf=".`echo $dver | sed 's/\.//'`mdk"
    3839elif [ -e /etc/mandrake-release ]; then
     40    export dfam="mandriva"
    3941    export ddir="mandrake"
    4042    export dver=`awk '{print $3}' /etc/mandrake-release`
     
    4345    grep -q Enterprise /etc/redhat-release
    4446    if [ $? -eq 0 ]; then
     47        export dfam="redhat"
    4548        export ddir="rhel"
    4649        export dver=`awk '{print $7}' /etc/redhat-release`
    4750    elif grep -q Fedora /etc/redhat-release ; then
     51        export dfam="redhat"
    4852        export ddir="fedora"
    4953        export dver=`awk '{print $4}' /etc/redhat-release`
    5054        export suf=".fc${dver}"
    5155    else
     56        export dfam="redhat"
    5257        export ddir="redhat"
    5358        dver=`awk '{print $5}' /etc/redhat-release`
     
    5863    grep -q Enterprise /etc/SuSE-release
    5964    if [ $? -eq 0 ]; then
     65        export dfam="suse"
    6066        export ddir="sles"
    6167        export dver=`head -1 /etc/SuSE-release | awk '{print $5}'`
    6268    else
     69        export dfam="suse"
    6370        export ddir="suse"
    6471        export dver=`head -1 /etc/SuSE-release | awk '{print $3}'`
    6572    fi
    6673else
     74    export dfam="generic"
    6775    export dver=""
    6876    export ddir="generic"
  • trunk/website/mondorescue.org.conf

    r387 r394  
    55
    66<VirtualHost *:80>
    7     ServerName www.mondorecue.org
     7    ServerName www.mondorescue.org
    88    ServerAdmin webmaster@mondorescue.org
    99    DocumentRoot /mondo/www/html/mondo
     
    1919
    2020<VirtualHost *:80>
    21     ServerName www1.mondorecue.org
     21    ServerName www1.mondorescue.org
    2222    ServerAdmin webmaster@mondorescue.org
    2323    DocumentRoot /mondo/www/html/test
Note: See TracChangeset for help on using the changeset viewer.