Changeset 519


Ignore:
Timestamp:
May 1, 2006, 1:54:31 AM (13 years ago)
Author:
bcornec
Message:

merge -r 437:447 $SVN_M/branches/stable
merge -r 461:464 $SVN_M/branches/stable
merge -r 465:472 $SVN_M/branches/stable
merge -r 473:479 $SVN_M/branches/stable
merge -r 480:488 $SVN_M/branches/stable
merge -r 491:494 $SVN_M/branches/stable
merge -r 508:516 $SVN_M/branches/stable

Location:
branches/2.0.8
Files:
19 edited
7 copied

Legend:

Unmodified
Added
Removed
  • branches/2.0.8/documentation/mondoarchive.8

    r402 r519  
    369369Backup PC using DVD Media:
    370370.br
    371 .I "mondoarchive -OVr 2 -d /dev/scd0 -gF -s 4200m"
     371.I "mondoarchive -OVr -d /dev/scd0 -gF -s 4200m"
    372372
    373373.BI TAPE:
  • branches/2.0.8/documentation/mondorescue-howto.sgml

    r435 r519  
    24582458</qandaentry>
    24592459<qandaentry>
    2460 <question><para>Q: Where is my CD burner, in SCSI
    2461                 terms?</para></question>
     2460<question><para>Q: Where is my CD burner, in SCSI terms?</para></question>
    24622461<answer>
    24632462<para>A: Type:</para>
     
    24852484long as your kernel and modules support it, Mindi will support it
    24862485and therefore so will Mondo.</para>
     2486</answer>
     2487</qandaentry>
     2488<qandaentry>
     2489        <question><para>Q: Why doesn't cdrecord -scanbus work ?</para></question>
     2490        <answer>
     2491                <para>A: If you have a 2.4.x kernel (typical example are fedora legacy kernels for redhat 7.X/8/9) and an IDE CDRW device, and the drive is not
     2492listed when you run
     2493
     2494<informaltable><tgroup cols="1"><tbody>
     2495<row>
     2496<entry>
     2497bash# cdrecord -scanbus
     2498</entry>
     2499</row>
     2500</tbody></tgroup></informaltable>
     2501
     2502try adding the following kernel option to your boot script to enable
     2503SCSI emulation: hdx=ide-scsi, where "hdx" should be replaced with the
     2504appropriate drive letter of the CDRW device, e.g., "hdc".
     2505(Answer provided by Christopher Moriarity cdm7_at_cdc.gov)
     2506</para>
    24872507</answer>
    24882508</qandaentry>
  • branches/2.0.8/mindi/install.sh

    r467 r519  
    5858fi
    5959chmod 755 $local/sbin/mindi
    60 install -m 755 analyze-my-lvm parted2fdisk.pl $local/sbin
     60install -m 755 parted2fdisk.pl $local/sbin
     61install -m 755 analyze-my-lvm $locallib/mindi
    6162
    6263install -m 644 mindi.8 $MANDIR
     
    103104if [ "$RPMBUILDMINDI" != "true" ]; then
    104105    chown -R root:root $locallib/mindi $conf $DOCDIR
    105     chown root:root $local/sbin/mindi $MANDIR/mindi.8 $local/sbin/analyze-my-lvm $local/sbin/parted2fdisk.pl
     106    chown root:root $local/sbin/mindi $MANDIR/mindi.8 $locallib/mindi/analyze-my-lvm $local/sbin/parted2fdisk.pl
    106107    if [ "$ARCH" = "ia64" ] ; then
    107108        chown root:root $local/sbin/parted2fdisk
  • branches/2.0.8/mindi/mindi

    r495 r519  
    6767FLOPPY_MODS="ide-floppy floppy"
    6868TAPE_MODS="ht st osst ide-tape ide_tape"
    69 SCSI_MODS="3c59x 3w-xxxx 53c7,8xx a100u2w a320raid aacraid advansys aha152x aha1542 aha1740 aic79xx aic79xx_mod aic7xxx aic7xxx_mod aic7xxx_old AM53C974 atp870u BusLogic cciss cpqfc dmx3191d dpt_i2o dtc eata eata_dma eata_pio fdomain gdth g_NCR5380 ide-scsi ieee1394 imm in2000 initio ips iscsi isp megaraid mptbase mptscsih NCR53c406a ncr53c8xx nsp32 pas16 pci2000 pci2220i pcmcia ppa psi240i qla1280 qlogicfas qlogicfc qlogicisp raw1394 scsi_debug scsi_mod sd_mod seagate sg sim710 sr_mod sym53c416 sym53c8xx sym53c8xx_2 t128 tmscsim u14-34f ultrastor wd7000 vmhgfs"
     69SCSI_MODS="3w-xxxx 53c7,8xx a100u2w a320raid aacraid advansys aha152x aha1542 aha1740 aic79xx aic79xx_mod aic7xxx aic7xxx_mod aic7xxx_old AM53C974 atp870u BusLogic cciss cpqfc dmx3191d dpt_i2o dtc eata eata_dma eata_pio fdomain gdth g_NCR5380 ide-scsi ieee1394 imm in2000 initio ips iscsi isp megaraid mptbase mptscsih NCR53c406a ncr53c8xx nsp32 pas16 pci2000 pci2220i pcmcia ppa psi240i qla1280 qlogicfas qlogicfc qlogicisp raw1394 scsi_debug scsi_mod sd_mod seagate sg sim710 sr_mod sym53c416 sym53c8xx sym53c8xx_2 t128 tmscsim u14-34f ultrastor wd7000 vmhgfs"
    7070
    7171# ide-probe-mod
     
    7474USB_MODS="usb-storage usb-ohci usb-uhci usbcore usb_storage hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd usbkbd"
    7575CDROM_MODS="$TAPE_MODS $FLOPPY_MODS $IDE_MODS af_packet cdrom isocd isofs inflate_fs nls_iso8859-1 nls_cp437 sg sr_mod zlib_inflate $USB_MODS $PCMCIA_MODS"
    76 NET_MODS="sunrpc nfs nfs_acl lockd loop mii e100 bcm5700 e1000 eepro100 tg3 pcnet32 vmxnet"
    77 EXTRA_MODS="$CDROM_MODS vfat fat loop linear raid0 raid1 raid5 lvm-mod dm-mod jfs xfs xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfs_acl nfsd lockd sunrpc jbd"
     76NET_MODS="sunrpc nfs nfs_acl lockd loop mii 3c59x e100 bcm5700 e1000 eepro100 ne2k-pci tg3 pcnet32 8139cp 8139too 8390 vmxnet"
     77EXTRA_MODS="$CDROM_MODS vfat fat loop md-mod linear raid0 raid1 xor raid5 lvm-mod dm-mod jfs xfs xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfs_acl nfsd lockd sunrpc jbd"
    7878LOGFILE=/var/log/mindi.log
    7979FDDEVICE=/dev/fd0             ; # 1.44MB floppy #0
     
    452452    [ "$?" -ne "0" ] && cat /tmp/mke2fs.$$
    453453    rm -f /tmp/mke2fs.$$
    454     mount -t ext2 -o loop $imagefile $mountpoint || Die "Can't loopmount $mountpoint; does your kernel support loopfs? If not, please recompile your kernel. Your Linux distro is broken."
     454    mount -t ext2 -o loop $imagefile $mountpoint || Die "Can't loopmount $imagefile to $mountpoint! The reason may be missing support for loopfs or ext2 (or both) in the running kernel."
    455455    mv $tarball $mountpoint/
    456456    if [ "$?" -ne "0" ] ; then
     
    13151315    if [ -d "/proc/lvm" ] || [ -d "/dev/mapper" ]; then
    13161316    echo -en "\rAnalyzing LVM...\r"
    1317     all_partitions=`$MINDI_SBIN/analyze-my-lvm | fgrep ">>>" | cut -d' ' -f2-32`
     1317    all_partitions=`$MINDI_LIB/analyze-my-lvm | fgrep ">>>" | cut -d' ' -f2-32`
    13181318    fi
    13191319    all_partitions="$all_partitions `ListAllPartitions 2> /dev/null`"
     
    13301330    [ "`echo "$c_p" | grep -x "/dev/cdroms.*"`" ] && continue
    13311331    if [ -h "$c_p" ] && [ "`echo "$c_p" | fgrep "/dev/hd"`" = "" ] && [ "`echo "$c_p" | fgrep "/dev/sd"`" = "" ] && [ "`echo "$c_p" | fgrep "/dev/md"`" = "" ] ; then
    1332             current_partition=`ResolveSoftlink $c_p`
     1332        current_partition=`ResolveSoftlink $c_p`
    13331333        [ "`echo "$current_partition" | fgrep "/dev/mapper"`" != "" ] && current_partition="$c_p"
    1334             [ "`echo "/dev/scd0 /dev/scd1 /dev/sr0 /dev/sr1 /dev/cdrom /dev/cdrom1" | fgrep "$current_partition"`" ] && continue
     1334        [ "`echo "/dev/scd0 /dev/scd1 /dev/sr0 /dev/sr1 /dev/cdrom /dev/cdrom1" | fgrep "$current_partition"`" ] && continue
    13351335    else
    13361336        current_partition="$c_p"
    13371337    fi
    13381338    [ "$c_p" = "none" ] && continue
    1339         absolute_partition=`ResolveSoftlink $c_p`
     1339    absolute_partition=`ResolveSoftlink $c_p`
    13401340    partition_mountpt=`tr -s '\t' ' ' < $MY_FSTAB | grep -w "$current_partition" | grep -vx " *#.*" | $AWK '{print $2}' | head -n1`
     1341
     1342    # This part tries to retrieve the correct device from a LABEL line in /etc/fstab
     1343    # current_partition contains only first column of /etc/fstab
    13411344    redhat_label=""
    1342     if [ "`echo "$current_partition" | fgrep -i "LABEL="`" != "" ] ; then
     1345    if [ "`echo "$current_partition" | /bin/grep -f -i "LABEL="`" != "" ] ; then
    13431346        str_to_find_fmt_with=$current_partition
    1344         redhat_label=`echo "$current_partition" | cut -d'=' -f2`
    1345         actual_dev=`mount -l | fgrep " [$redhat_label]" | cut -d' ' -f1`
    1346 #       partition_mountpt=$redhat_label
    1347         current_partition=$actual_dev
     1347        redhat_label=`echo "$current_partition" | /bin/cut -d'=' -f2`
     1348        actual_dev=""
     1349
     1350        # 1st try : blkid, the good way
     1351        if [ -x "/sbin/blkid" ] ; then
     1352            actual_dev=`/sbin/blkid | grep "$current_partition" | /bin/cut -d':' -f1`
     1353        fi
     1354        # 2nd try, which works on a standard partition (ext2/3), but not on swap
     1355        if [ $actual_dev="" ] ; then
     1356            actual_dev=`/bin/mount -l | /bin/grep " [$redhat_label]" | /bin/cut -d' ' -f1`
     1357        fi
     1358        # 3rd try, with vol_id (which works with swap)
     1359        if [ $actual_dev="" -a -x "/sbin/vol_id" ] ; then
     1360                list_swaps=`cat /proc/swaps | /bin/grep "/dev/" | /bin/awk '{ print $1 }' `
     1361                for dev_swap in $list_swaps ; do
     1362                    dev_exists=`/sbin/vol_id $dev_swap | /bin/grep -f "$redhat_label"`
     1363                    if [ -n "$dev_exists" ] ; then
     1364                        actual_dev=$dev_swap
     1365                        break;
     1366                    fi
     1367                done
     1368        fi
     1369        # 4th try : pre-formated LABEL. Format is : LABEL=SWAP-mydevice. e.g. : LABEL=SWAP-hda5
     1370        if [ $actual_dev="" -a  "`echo "$current_partition" | /bin/grep -f -i "LABEL=SWAP"`" != ""] ; then
     1371                actual_dev="/dev/`echo "$redhat_label" | /bin/cut -d '-' -f2`"
     1372        fi
     1373        # Check if one of all those tries has known success
     1374        if [  $actual_dev != "" ] ; then
     1375                current_partition=$actual_dev
     1376        else
     1377            Die "Your system uses a labelled swap partition, but you lack the tool to su
     1378pport it.\nPlease replace swap labels with their correct devices in /etc/fstab\n"
     1379        fi
    13481380    else
    13491381        str_to_find_fmt_with=$current_partition
    13501382    fi
     1383
    13511384    partition_format=`$AWK '$1 == "'"$str_to_find_fmt_with"'" {print $3}' $MY_FSTAB`
    13521385    if [ -d "/proc/lvm" ] && [ "`lvdisplay $current_partition 2> /dev/null`" ] ; then
     
    22172250    cp -f $TMP_ROOT/mountlist.txt $CACHE_LOC
    22182251    [ "`DidMondoCallMe`" ] && cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MONDO_TMP/.
    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
     2252    [ -d "/proc/lvm" ] && $MINDI_LIB/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
     2253    [ -d "/dev/mapper" ] && $MINDI_LIB/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
    22212254    cat $minidir_root/$noof_disks/tmp/mountlist.txt >> $LOGFILE
    22222255    ZipMinidirsIntoTarballs $minidir_root $tardir $noof_disks
     
    25352568       root="/"
    25362569    fi
    2537     for fname in `find $root -maxdepth 2 -type f | fgrep lin | fgrep -v /proc/` ; do
     2570    for fname in `find $root -maxdepth 2 -type f | fgrep lin | egrep -v '^/proc/|^/net/'` ; do
    25382571    [ ! -e "$fname" ] && continue
    25392572        [ "$fname" = "/boot/vmlinuz.shipped" ] && [ -f "/boot/vmlinuz" ] && continue; # ignore SuSE's extra kernel
     
    26952728    echo -en "..."
    26962729    mkdir -p $mountpoint
    2697     mount -t ext2 -o loop $tempfile $mountpoint || Die "Cannot loopmount $tempfile to $mountpoint"
     2730    mount -t ext2 -o loop $tempfile $mountpoint || Die "Cannot loopmount $tempfile to $mountpoint! The reason may be missing support for loopfs or ext2 (or both) in the running kernel."
    26982731    echo -en "..."
    26992732    old_pwd=`pwd`
     
    31953228    else
    31963229        if ! PrepareBootDiskImage_LILO $imagesdir 1722 $kernelpath $ramdisk_size ; then
    3197         LogIt "Warning - failed to create 1.72MB boot image. Please reduce your kernel's size\n"
    3198         LogIt "if you want to make a 1.72MB floppy disk.\n"
    3199         fi
    3200         PrepareBootDiskImage_LILO $imagesdir 2880 $kernelpath $ramdisk_size || Die "Failed to create 2.88MB floppy disk image."
     3230            LogIt "Warning - failed to create 1.72MB boot image. Please reduce your kernel's size\n"
     3231            LogIt "if you want to make a 1.72MB floppy disk.\n"
     3232        fi
     3233        if ! PrepareBootDiskImage_LILO $imagesdir 2880 $kernelpath $ramdisk_size ;  then
     3234            LogIt "Warning - failed to create 2.88MB floppy disk image.\n"
     3235            LogIt "Please reduce your kernel's size\n"
     3236            LogIt "if you want to make a 2.88MB floppy disk.\n"
     3237            PrepareBootDiskImage_LILO $imagesdir 5760 $kernelpath $ramdisk_size || Die "Failed to create 2.88MB floppy disk image."
     3238        fi
    32013239    fi
    32023240else
  • branches/2.0.8/mondo/configure.in

    r423 r519  
    7272        AC_CHECK_LIB(pthread, pthread_create, true, [echo "*** Cannot find -lpthread."; echo "*** Please make sure you have the linuxthreads glibc add-on installed."; exit 1])
    7373        PTHREAD="-lpthread"
    74         CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT"
     74        CFLAGS="$CFLAGS -Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT"
    7575        ;;
    7676    *)
  • branches/2.0.8/mondo/distributions/mandriva/spec.m4

    r455 r519  
    88define(`GRP', `Archiving/Backup')dnl
    99dnl OBS is replaced vy what is being obsoleted
    10 define(`OBS', Obsoletes:    libmondo <= 2.04)dnl
     10define(`OBS', `Obsoletes:   libmondo <= 2.04
     11Provides:   libmondo')dnl
  • branches/2.0.8/mondo/mondo/common/libmondo-archive-EXT.h

    r296 r519  
    4141                                          char *filelist, char *fname,
    4242                                          int setno);
    43 extern void setenv_mondo_lib(void);
     43extern void setenv_mondo_share(void);
  • branches/2.0.8/mondo/mondo/common/libmondo-archive.h

    r296 r519  
    4242int archive_this_fileset_with_star(struct s_bkpinfo *bkpinfo,
    4343                                   char *filelist, char *fname, int setno);
    44 void setenv_mondo_lib(void);
     44void setenv_mondo_share(void);
  • branches/2.0.8/mondo/mondo/common/libmondo-verify.c

    r296 r519  
    10201020
    10211021    sprintf(mountpoint, "%s/cdrom", bkpinfo->tmpdir);
    1022     sprintf(fname, "%s/%s/%s-%d.iso", bkpinfo->nfs_remote_dir,
    1023             bkpinfo->isodir, bkpinfo->prefix, g_current_media_number);
     1022    sprintf(fname, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir,
     1023            bkpinfo->prefix, g_current_media_number);
    10241024
    10251025    mkdir(mountpoint, 1777);
  • branches/2.0.8/mondo/mondo/common/mondostructures.h

    r296 r519  
    477477   * If you do nothing, "/" will be used.
    478478   */
    479     char include_paths[MAX_STR_LEN];
     479    char include_paths[MAX_STR_LEN*4];
    480480
    481481  /**
     
    484484   * the scratchdir, and the tempdir are automatically excluded.
    485485   */
    486     char exclude_paths[MAX_STR_LEN];
     486    char exclude_paths[MAX_STR_LEN*4];
    487487
    488488  /**
  • branches/2.0.8/mondo/mondo/mondoarchive/mondo-cli.c

    r468 r519  
    918918        &&
    919919        !run_program_and_log_output
    920         ("grep -i suse /etc/issue.net | grep 64", TRUE)) {
     920        ("egrep -i suse /etc/issue.net | egrep '9.0' | grep 64", TRUE)) {
    921921        bkpinfo->make_cd_use_lilo = TRUE;
    922922        log_to_screen
  • branches/2.0.8/mondo/mondo/mondorestore/mondo-restore.c

    r433 r519  
    19771977                filelist_name);
    19781978        log_msg(2,
    1979                 "This is a bit silly (ask Hugo to fix mondo-makefilelist, please)");
     1979                "This is a bit silly (ask dev-team to fix mondo-makefilelist, please)");
    19801980        log_msg(2,
    19811981                "but it's non-critical. It's cosmetic. Don't worry about it.");
     
    20542054            if (filelist_subset_fname[0] != '\0') {
    20552055                sprintf(command,
    2056                         "afio -i -M 8m -b %ld -c %ld %s -w %s %s",
     2056                        "afio -i -M 8m -b %ld -c %ld %s -w '%s' %s",
    20572057                        TAPE_BLOCK_SIZE,
    20582058                        BUFSIZE, executable, filelist_subset_fname,
  • branches/2.0.8/tools/livwww

    r436 r519  
    1616TESTDIR=/mondo/www/html/test
    1717
    18 force=0
     18force=1
    1919nodoc=0
    2020
    21 if [ "$1" = "-f" ]; then
    22         force=1
     21if [ "$1" = "--keep" ]; then
     22        force=0
    2323        optsvn=""
    2424        shift
     
    3535    DESTMACH=mondo.hpintelco.org
    3636else
    37     DESTMACH=www1.mondorescue.org
     37    DESTMACH=www.mondorescue.org
    3838fi
    3939
  • branches/2.0.8/tools/mkdeb

    r319 r519  
    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
    31     pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-kernel-${MINDI_VER}-${REVISION}${suf}.${ARCH}.rpm"
     30    $TOOLHOME/mkspec ${MINDI_VER} mindi-kernel-${MINDI_VER}/mindi-kernel.spec > ${TOPDIR}/SPECS/mindi-kernel.spec
     31    chmod 644 ${TOPDIR}/SPECS/mindi-kernel.spec
     32    pkg1="${TOPDIR}/RPMS/${ARCH}/mindi-kernel-${MINDI_VER}-${REVISION}${suf}.${ARCH}.rpm"
     33    pkg="$pkg $pkg1"
     34    rm -f $pkg1
    3235fi
    3336if [ "`echo $c | grep -v kernel | grep mindi`" != "" ]; then
    3437    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
     38    $TOOLHOME/mkspec ${MINDI_VER} mindi-${MINDI_VER}/distributions/rpm/mindi.spec > ${TOPDIR}/SPECS/mindi.spec
     39    cat mindi-${MINDI_VER}/distributions/$dfam/changelog >> ${TOPDIR}/SPECS/mindi.spec
     40    chmod 644 ${TOPDIR}/SPECS/mindi.spec
    4141    rm -rf mindi-${MINDI_VER}/distributions
    4242    mkdir -p ${TOPDIR}/SOURCES
    4343
    44     pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${REVISION}${suf}.${ARCH}.rpm"
    45     # ATTENTION: This could be dangerous for your setup
    46     opt="rm -rf /usr/lib/mindi ;"
     44    pkg1="${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${REVISION}${suf}.${ARCH}.rpm"
     45    pkg="$pkg $pkg1"
     46    rm -f $pkg1
    4747fi
    4848if [ "`echo $c | grep  mondo`" != "" ]; then
    4949    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
     50    $TOOLHOME/mkspec ${MONDO_VER} mondo-${MONDO_VER}/distributions/rpm/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
     51    cat mondo-${MONDO_VER}/distributions/$dfam/changelog >> ${TOPDIR}/SPECS/mondo.spec
     52    chmod 644 ${TOPDIR}/SPECS/mondo.spec
    5653    rm -rf mondo-${MONDO_VER}/distributions
    5754
    58     pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${REVISION}${suf}.${ARCH}.rpm"
     55    pkg1="${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${REVISION}${suf}.${ARCH}.rpm"
     56    pkg="$pkg $pkg1"
     57    rm -f $pkg1
    5958fi
    6059
  • branches/2.0.8/tools/mkqemu

    r447 r519  
    1212
    1313if [ _"$2" == _"" ]; then
    14     export SVN_VM="mdk101 mdk102 mdv2006 rhel3 rhel4 rh73 fc4 sles9"
     14    export SVN_VM="mdk101 mdk102 mdv2006 rh73 rh9 fc4 fc5 rhel3 rhel4 suse10 sles9 debian31"
    1515else
    1616    export SVN_VM="$2"
     
    4343    fi
    4444fi
    45 \$SVN_HOME/$1/tools/mkrpm < /dev/null
     45echo \$SVN_VM | grep -q "debian"
     46if [ \$? -eq 0 ]; then
     47    \$SVN_HOME/$1/tools/mkdeb < /dev/null
     48else
     49    \$SVN_HOME/$1/tools/mkrpm < /dev/null
     50fi
    4651\$SVN_HOME/$1/tools/mkdeliv
    4752EOF
     
    4954ipvm=10.0.2.15
    5055sp=2222
     56
    5157
    5258for m in $SVN_VM; do
     
    6066        # Virtual machine alreday started
    6167        vmp=1
    62         qemu -m 256 -redir tcp:${sp}:${ipvm}:22 /users/vmplayer/$m.qemu &
    63         sleep 240
     68        qemu -m 256 $QEMUOPT -redir tcp:${sp}:${ipvm}:22 /users/vmplayer/$m.qemu &
     69        sleep 300
    6470    fi
    6571    scp -P $sp /tmp/mkmondo bruno@localhost:
     
    6773    if [ $vmp -eq 1 ]; then
    6874        ssh -p $sp root@localhost "halt -p"
     75        sleep 300
     76        proces=`ps auxww | grep qemu | grep -v grep | grep -q /users/vmplayer/$m.qemu | awk '{print $2}'`
     77        if [ "$proces" != "" ]; then
     78            kill $proces
     79        fi
    6980    fi
    7081done
  • branches/2.0.8/tools/qemu-vm.txt

    r464 r519  
    3434
    3535Créer compte bruno avec répertoires nécéssaires + env necessaire
    36 adduser bruno
     36useradd bruno
    3737passwd bruno
    3838
  • branches/2.0.8/website/about.shtml

    r396 r519  
    9090      <P ALIGN=CENTER>
    9191       <I>Michael Clark</I><BR>
    92        original DPF docs</P>
     92       original PDF docs</P>
    9393  <div class="h2-5">
    9494          <h2>The Mondo Rescue Community</h2>
  • branches/2.0.8/website/downloads.shtml

    r423 r519  
    6363<p>Most of the time, you'll be able to download directly the packages suited for your distribution. Currently we provide packages for :
    6464<ul>
    65         <li>RedHat <a href="ftp://ftp.mondorescue.org/redhat/7.3">7.3</a>.</li>
    66         <li>Fedora <a href="ftp://ftp.mondorescue.org/fedora/4">Core 4</a>.</li>
     65        <li>RedHat <a href="ftp://ftp.mondorescue.org/redhat/7.3">7.3</a> and <a href="ftp://ftp.mondorescue.org/redhat/9">9</a>.</li>
     66        <li>Fedora <a href="ftp://ftp.mondorescue.org/fedora/4">Core 4</a> and <a href="ftp://ftp.mondorescue.org/fedora/5">Core 5</a>.</li>
    6767        <li>RedHat Enterprise Linux <!--<a href="ftp://ftp.mondorescue.org/rhel/2.1">2.1</a>, --><a href="ftp://ftp.mondorescue.org/rhel/3">3</a>, <a href="ftp://ftp.mondorescue.org/rhel/4">4</a>.</li>
    6868        <li>OpenSuSE <a href="ftp://ftp.mondorescue.org/suse/9.3">9.3</a>, <a href="ftp://ftp.mondorescue.org/suse/10.0">10.0</a>. Look also at <a href="http://www.mikenjane.net/~mike/">this</a> web page for SuSE details.
     
    7676<h3>Mondo Rescue CD</h3>
    7777
    78 <p>In order to make it as easy as possible for you to use Mondo Rescue, you may want to download the latest <a href="ftp://ftp.mondorescue.org/iso/mondorescue.iso">Mondo Rescue CD</a> which contains all the packages with its dependancies available on the ftp site. It is updated daily.
    79 
     78<p>In order to make it as easy as possible for you to use Mondo Rescue, you may want to download the latest <a href="ftp://ftp.mondorescue.org/iso/mondorescue.iso">Mondo Rescue CD</a> which contains all the packages with its dependancies available on the ftp site. It is updated daily (Currently un-available for bandwidth issues)
    8079<!--
    8180    <div class="h2-5">
  • branches/2.0.8/website/latest-news.html

    r420 r519  
    1 <p><B>2006-02-21 </B>Mondo Rescue has a new Web site</p>
    2 <p>Thanks to <a href="http://www.73lab.com">Ayo</a>'s authorization, and after 2 weeks of hard work, we are proud to announce that we now have a new and updated Web site. We hope it will be useful and wait for your feedback.</p>
    3 <p>You may find it at <a href="http://www.mondorescue.org">http://www.mondorescue.org</a> (IP: 213.30.161.23)</p>
    4 <p><B>2006-02-05 </B>Mondo Rescue referenced by HP</p>
    5 <p>Mondorescue has been officially referenced by the HP OpenSource Portal:
    6 <a href="http://opensource.hp.com/index.php">http://opensource.hp.com/index.php</a> (look in the "Recently released" area)</p>
    7 <p><B>2006-02-02 </B>Mondo Rescue rsync server available</p>
    8 <p>In our always increasing set of services :-) I'd like to announce the
    9 availability of an rsync mirror service for mondo-rescue.
     1<p><B>2006-04-08 </B>Mondo 2.0.7 / Mindi 1.0.7 updated to r460</p>
     2<p>
     3I'm happy to announce the availability of a newest version of
     4mondo 2.0.7 / mindi 1.0.7 aka r460
     5</p>
    106
    11 Try rsync rsync.mondorescue.org::</p>
    12 <p><B>2006-02-01 </B>Mondo Rescue ftp server available</p>
    13 <p>Things are progressing. I've gathered all the packages that were originally on <a href="http://www.mondorescue.org">http://www.mondorescue.org</a> and also added Mike's SuSE RPMs
    14 + all the latest packages I've produced and put them on a new ftp server
    15 accessible at <a href="ftp://ftp.mondorescue.org">ftp://ftp.mondorescue.org</a>
    16 </p><p>
    17 You may have issues to access to it yet, as I've done a DNS refresh this
    18 night and propagation could not be made everywhere now.
     7<p>
     8Now available at ftp://ftp.mondorescue.org/
     9</p>
    1910
    20 FYI:
     11<p>
     12fedora/4/mindi-1.0.7-460.fc4.i386.rpm
     13fedora/4/mondo-2.0.7-460.fc4.i386.rpm
     14fedora/5/mindi-1.0.7-460.fc5.i386.rpm
     15fedora/5/mondo-2.0.7-460.fc5.i386.rpm
     16mandrake/10.1/mindi-1.0.7-460.101mdk.i386.rpm
     17mandrake/10.1/mondo-2.0.7-460.101mdk.i386.rpm
     18mandrake/10.2/mindi-1.0.7-460.102mdk.i386.rpm
     19mandrake/10.2/mondo-2.0.7-460.102mdk.i386.rpm
     20mandriva/2006.0/mindi-1.0.7-460.20060mdk.i586.rpm
     21mandriva/2006.0/mondo-2.0.7-460.20060mdk.i586.rpm
     22redhat/73/mindi-1.0.7-460.rh73.i386.rpm
     23redhat/73/mondo-2.0.7-460.rh73.i386.rpm
     24redhat/9/mindi-1.0.7-460.rh9.i386.rpm
     25redhat/9/mondo-2.0.7-460.rh9.i386.rpm
     26rhel/3/mindi-1.0.7-460.rhel3.i386.rpm
     27rhel/3/mondo-2.0.7-460.rhel3.i386.rpm
     28rhel/4/mindi-1.0.7-460.rhel4.i386.rpm
     29rhel/4/mondo-2.0.7-460.rhel4.i386.rpm
     30sles/9/mindi-1.0.7-460.sles9.i386.rpm
     31sles/9/mondo-2.0.7-460.sles9.i386.rpm
     32suse/10.0/mindi-1.0.7-464.suse10.0.i386.rpm
     33suse/10.0/mondo-2.0.7-464.suse10.0.i386.rpm
     34</p>
    2135
    22 </p><p>
    23 $ host ftp.mondorescue.org<br>
    24 ftp.mondorescue.org has address 213.30.161.23
    25 </p><p>
    2636
    27 The tree is:
    28 </p><p>
    29 level one distribution<br>
    30 level two version number<br>
    31 level three the packages
     37<p>
     38Changes are few:
     39</p>
    3240
    33 </p><p>
    34 Feel free to send me (by private mail) packages that you have and that
    35 are not in the repository, so that I can add them.
     41<p>
     42MONDO:
     43</p>
    3644
    37 </p><p>
    38 Thanks to HP and especially the HP/Intel Solution Center to help me
    39 hosting the project.
     45<p>
     46Remove speed=1 for growisofs (better version expected for 2.0.8)
     47Usage of Epoch for RPMs to ease update
     48</p>
    4049
    41 Next step will be the Web site.</p>
     50<p>
     51MINDI:
     52</p>
     53
     54<p>
     55analyze-my-lvm is under $MINDI_SBIN (not _LIB)
     56Usage of Epoch for RPMs to ease update
     57</p>
     58
     59<p><B>2006-03-20 </B>Mondo 2.0.7 / Mindi 1.0.7 are out</p>
     60<p>
     61I'm happy to announce the availability of the latest and greatest
     62version of mondo 2.0.7 / mindi 1.0.7. Version numbers have changed of
     63format to be more in line with what is done generally (x.y.z)
     64</p>
     65<p>
     66Now available at ftp://ftp.mondorescue.org :
     67</p>
     68
     69<p>
     70mandrake/10.1/mindi-1.0.7-447.101mdk.i386.rpm<br>
     71mandrake/10.1/mondo-2.0.7-447.101mdk.i386.rpm<br>
     72mandrake/10.2/mindi-1.0.7-447.102mdk.i386.rpm<br>
     73mandrake/10.2/mondo-2.0.7-447.102mdk.i386.rpm<br>
     74mandriva/2006.0/mindi-1.0.7-447.20060mdk.i386.rpm<br>
     75mandriva/2006.0/mondo-2.0.7-447.20060mdk.i386.rpm<br>
     76src/mindi-1.0.7-r447.tgz<br>
     77src/mondo-2.0.7-r447.tgz<br>
     78</p>
     79
     80<p>
     81Other distributions will follow asap (should be able to produce soon
     82redhat 7.3, fedora core 4, and only after rhel3/4 and sles9) due to the
     83change in the virtual machines I have to do (now using qemu + more tools
     84to generate RPMs)
     85</p>
     86
     87<p>
     88The focus on this version has been more around the new website and
     89documentation, and a bit less on code. So some persistant bugs are still
     90not corrected (some dvd burning issues and dm/lvm2 support mainly) and
     91will be hopefully in 2.0.8.
     92</p>
     93
     94<p>
     95MONDO CHANGES
     96</p>
     97
     98<p>
     99v2.07 (2006-02-23)<br>
     100- useless cat, sort|uniq commands removed (Bruno Cornec/Sébastien Aperghis-Tramoni)<br>
     101- Doc cleanup (Andree Leidenfrost)<br>
     102- Add the actual format to messages after calls to function is_this_a_valid_disk_format() about unsupported formats.  (Andree Leidenfrost)<br>
     103- Abort|Warn when one of the include|exclude dirs (-I|-E) does not exist (Bruno Cornec/Jeffs)<br>
     104- Replaced partimagehack with ntfsclone from ntfsprogs package. (Andree Leidenfrost)<br>
     105- use df -P everywhere (Bruno Cornec)<br>
     106- Paypal incitations removed (Andree Leidenfrost)<br>
     107- mondo now uses /usr/share for the restore-scripts (Bruno Cornec)<br>
     108- rpmlint cleanups (Bruno Cornec)<br>
     109- no shared librairies and no X11 anymore (were useless) (Bruno Cornec)<br>
     110- files > 2GB are now really supported (Andree Leidenfrost)<br>
     111- new SGML based Mondo Rescue documentation + new Web site (Bruno Cornec/Andree Leidenfrost)<br>
     112- mondoarchive aborts when 'mindi --findkernel' gives a fatal error (See also Debian bug #352323.) (Andree Leidenfrost)<br>
     113- /tmp not excluded anymore from backup (Bruno Cornec)<br>
     114- New RPM Build environement (Bruno Cornec)<br>
     115</p>
     116
     117<p>
     118MINDI CHANGES
     119</p>
     120
     121<p>
     1221.07 (2006-02-23)<br>
     123- stop creating further size of floppy disks if the smaller one succeeds (Bruno Cornec)<br>
     124- init revamped (removed unnecessary second general module loading phase, start NFS appropriately depending on PXE or simple NFS) (Andree Leidenfrost)<br>
     125  - Changed module 'nfsacl' to 'nfs_acl' (Andree Leidenfrost)<br>
     126  - Mindi/DiskSize is gone (Bruno Cornec)<br>
     127- useless cat, sort|uniq commands removed (Bruno Cornec/Sébastien Aperghis-Tramoni)<br>
     128- Doc cleanup (Andree Leidenfrost)<br>
     129- Bug fix for chown in install.sh (JeffS)<br>
     130- CHANGES renamed also in install.sh now (Bruno Cornec)<br>
     131- rpmlint cleanups<br>
     132- Get mindi to look for analyze-my-lvm in it's library directory MINDI_LIB (See also Debian bug #351446.)<br>
     133- mindi only deletes freshly created 1440kb images in case of error (See also Debian Bug #348966.) (Andree Leidenfrost)<br>
     134- try standard grub-install in grub-MR restore script before trying anything fancy (Andree Leidenfrost)<br>
     135- busybox mount should be called with -o ro for PXE (Make RHEL 3 works in PXE with a 2.6 failsafe kernel now available) (Bruno Cornec)<br>
     136- Fix mindi for 2.6 Failsafe support (Bruno Cornec)<br>
     137- mindi now depends on grep >= 2.5 (for -m option) (Marco Puggelli/Bruno Cornec)<br>
     138- Fix a bug in LVM context for RHEL4 in GetValueFromField (Rémi Bondoin/Bruno Cornec)<br>
     139- New RPM Build environement (Bruno Cornec)<br>
     140- mindi now supports x86_64 natively (Bruno Cornec)<br>
     141- stop creating further size of floppy disks if the smaller one succeeds (Bruno Cornec)<br>
     142</p>
  • branches/2.0.8/website/mondorescue.org.conf

    r389 r519  
    22# Apache Virtual Host Configuration File
    33#
    4 NameVirtualHost *:80
     4NameVirtualHost *
    55
    6 <VirtualHost *:80>
     6<VirtualHost *>
    77    ServerName www.mondorescue.org
     8    #ServerAlias mondorescue.org
    89    ServerAdmin webmaster@mondorescue.org
    910    DocumentRoot /mondo/www/html/mondo
    1011    CustomLog /var/log/httpd/www.mondorescue.org/access_log combined
    1112    Errorlog /var/log/httpd/www.mondorescue.org/error_log
     13    RewriteEngine On
     14    RewriteRule     ^/index\.html$  /index.shtml
     15    RewriteRule     ^/$  /index.shtml
    1216    <Directory "/mondo/www/html/mondo">
     17    DirectoryIndex index.shtml
    1318        Options -Indexes MultiViews FollowSymLinks +Includes
    1419        AllowOverride None
     
    1823</VirtualHost>
    1924
    20 <VirtualHost *:80>
     25<VirtualHost *>
     26    ServerName oldwww.mondorescue.org
     27    ServerAdmin webmaster@mondorescue.org
     28    DocumentRoot /mondo/www/html/oldwww
     29    CustomLog /var/log/httpd/oldwww.mondorescue.org/access_log combined
     30    Errorlog /var/log/httpd/oldwww.mondorescue.org/error_log
     31    <Directory "/mondo/www/html/oldwww">
     32        Options -Indexes MultiViews FollowSymLinks +Includes
     33        AllowOverride None
     34        Order allow,deny
     35        Allow from all
     36    </Directory>
     37</VirtualHost>
     38
     39<VirtualHost *>
    2140    ServerName www1.mondorescue.org
    2241    ServerAdmin webmaster@mondorescue.org
     
    3150    </Directory>
    3251</VirtualHost>
     52
     53<VirtualHost *>
     54    ServerName www.mondorescue.com
     55    ServerAdmin webmaster@mondorescue.com
     56    DocumentRoot /mondo/www/html/mondo
     57    CustomLog /var/log/httpd/www.mondorescue.com/access_log combined
     58    Errorlog /var/log/httpd/www.mondorescue.com/error_log
     59    <Directory "/mondo/www/html/mondo">
     60    DirectoryIndex index.shtml
     61        Options -Indexes MultiViews FollowSymLinks +Includes
     62        AllowOverride None
     63        Order allow,deny
     64        Allow from all
     65    </Directory>
     66</VirtualHost>
  • branches/2.0.8/website/news.shtml

    r396 r519  
    1414  </div>
    1515  <!--#include virtual="/latest-news.html" -->
     16<p><B>2006-02-02 </B>Mondo Rescue rsync server available</p>
     17<p>In our always increasing set of services :-) I'd like to announce the
     18availability of an rsync mirror service for mondo-rescue.
     19
     20Try rsync rsync.mondorescue.org::</p>
     21
     22<p><B>2006-02-01 </B>Mondo Rescue ftp server available</p>
     23<p>Things are progressing. I've gathered all the packages that were originally on <a href="http://www.mondorescue.org">http://www.mondorescue.org</a> and also added Mike's SuSE RPMs
     24+ all the latest packages I've produced and put them on a new ftp server
     25accessible at <a href="ftp://ftp.mondorescue.org">ftp://ftp.mondorescue.org</a>
     26</p><p>
     27You may have issues to access to it yet, as I've done a DNS refresh this
     28night and propagation could not be made everywhere now.
     29
     30FYI:
     31
     32</p><p>
     33$ host ftp.mondorescue.org<br>
     34ftp.mondorescue.org has address 213.30.161.23
     35</p><p>
     36
     37The tree is:
     38</p><p>
     39level one distribution<br>
     40level two version number<br>
     41level three the packages
     42
     43</p><p>
     44Feel free to send me (by private mail) packages that you have and that
     45are not in the repository, so that I can add them.
     46
     47</p><p>
     48Thanks to HP and especially the HP/Intel Solution Center to help me
     49hosting the project.
     50
     51Next step will be the Web site.</p>
     52
     53  <div class="h2-2">
     54    <h2>Older News</h2>
     55  </div>
     56
    1657<p><B>2005-12-24</B>
    1758I think that it's time to promote our revisions to a newer version, as a
Note: See TracChangeset for help on using the changeset viewer.