Changeset 2481


Ignore:
Timestamp:
Nov 12, 2009, 2:33:39 AM (10 years ago)
Author:
bruno
Message:
  • If using nolvm, mondorestore should also not analyze and handle i-want-my-lvm
  • Add support for diskdumplib driver useful for RHEL 3 and IBM xseries 336
  • Fix #367 - the for loop doesn't make any test now, as it was computed before entering the loop, leading to a

n error, and was also made inside the loop anyway.

  • Adds a nolvm boot option at restore time
  • small improvement for loging in USB case

(merge from 2.2.9 2475:2480)

Location:
branches/2.2.10
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.10/mindi/README.bootparam

    r2354 r2481  
    3939    Do not call the mindi-rsthw script which try to restore also your BIOSes configuration (Proliant only)
    4040
     41nolvm
     42    Do not try to start LVM support
     43
    4144nomd
    4245    Do not try to start mdadm support
  • branches/2.2.10/mindi/mindi

    r2475 r2481  
    5353MY_FSTAB=/etc/fstab
    5454TAPE_MODS="ht st osst ide-tape ide_tape"
    55 SCSI_MODS="3w-xxxx 3w_xxxx 3w_9xxx 3w-9xxx 53c7,8xx a100u2w a320raid aacraid adpahci 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 i2o_block i2o_core ide-scsi ieee1394 imm in2000 initio ips iscsi iscsi_tcp libiscsi scsi_transport_iscsi isp megaraid megaraid_mm megaraid_mbox megaraid_sas mptbase mptscsih mptsas mptspi mptfc mptscsi mptctl NCR53c406a ncr53c8xx nsp32 pas16 pci2000 pci2220i pcmcia ppa psi240i qla1280 qla2200 qla2300 qla2400 qla2xxx qla2xxx_conf qlogicfas qlogicfc qlogicisp qlogicfas qlogicfas408 raw1394 scsi_mod scsi_transport_sas scsi_transport_spi scsi_transport_fc sd_mod crc_t10dif crc-t10dif seagate sg sim710 sr_mod sym53c416 sym53c8xx sym53c8xx_2 t128 tmscsim u14-34f ultrastor wd7000 vmhgfs intermodule scsi_dh scsi_tgt emcpdm emcpgpx emcpmpx emcp dc395x"
     55SCSI_MODS="3w-xxxx 3w_xxxx 3w_9xxx 3w-9xxx 53c7,8xx a100u2w a320raid aacraid adpahci 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 i2o_block i2o_core ide-scsi ieee1394 imm in2000 initio ips iscsi iscsi_tcp libiscsi scsi_transport_iscsi isp megaraid megaraid_mm megaraid_mbox megaraid_sas mptbase mptscsih mptsas mptspi mptfc mptscsi mptctl NCR53c406a ncr53c8xx nsp32 pas16 pci2000 pci2220i pcmcia ppa psi240i qla1280 qla2200 qla2300 qla2400 qla2xxx qla2xxx_conf qlogicfas qlogicfc qlogicisp qlogicfas qlogicfas408 raw1394 scsi_mod scsi_transport_sas scsi_transport_spi scsi_transport_fc sd_mod crc_t10dif crc-t10dif seagate sg sim710 sr_mod sym53c416 sym53c8xx sym53c8xx_2 t128 tmscsim u14-34f ultrastor wd7000 vmhgfs intermodule scsi_dh scsi_tgt emcpdm emcpgpx emcpmpx emcp dc395x diskdumplib"
    5656
    5757# ide-probe-mod
     
    14861486    MakeBootConfFile syslinux > $MINDI_TMP/usb/syslinux.cfg
    14871487    echo -en "."
     1488    echo "----------- syslinux's conf --------------" |tee -a $LOGFILE
     1489    cat $MINDI_TMP/usb/syslinux.cfg |tee -a $LOGFILE
     1490    echo "------------------------------------------" |tee -a $LOGFILE
    14881491    umount $MINDI_TMP/usb
    14891492    if [ "$ARCH" != "ia64" ] ; then
     
    14921495            LogAll "----------- syslinux's errors --------------" |tee -a $LOGFILE
    14931496            cat $MINDI_TMP/syslinux.log |tee -a $LOGFILE
    1494             echo "----------- syslinux's conf --------------" |tee -a $LOGFILE
    1495             cat $MINDI_TMP/usb/syslinux.cfg |tee -a $LOGFILE
     1497            echo "------------------------------------------" |tee -a $LOGFILE
    14961498            LogAll "Failed to create USB image."
    14971499        else
  • branches/2.2.10/mindi/rootfs/sbin/init

    r2462 r2481  
    387387
    388388StartLvms() {
     389    if [ "`grep -i nolvm /proc/cmdline`" ]; then
     390        return;
     391    fi
    389392    if [ -e "/tmp/i-want-my-lvm" ] ; then
    390393        LogIt "Scanning LVM's..." 1
  • branches/2.2.10/mondo/src/common/libmondo-archive.c

    r2463 r2481  
    20422042                       get_last_filelist_number() + 1);
    20432043
    2044     for (; does_file_exist(curr_filelist_fname); curr_set_no++) {
     2044    for (;;) {
    20452045        /* backup this set of files */
    20462046        mr_asprintf(curr_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, curr_set_no);
     
    21232123        mr_free(curr_filelist_fname);
    21242124        mr_free(curr_afioball_fname);
     2125        curr_set_no++;
    21252126    }
    21262127    close_progress_form();
  • branches/2.2.10/mondo/src/mondorestore/mondo-prep.c

    r2462 r2481  
    213213    return (0);
    214214#endif
     215
     216    tmp = call_program_and_get_last_line_of_output("cat /proc/cmdline");
     217    if (strstr(tmp, "nolvm")) {
     218        mr_free(tmp);
     219        return(0);
     220    }
     221    mr_free(tmp);
    215222
    216223    if (!(fin = fopen("/tmp/i-want-my-lvm", "r"))) {
Note: See TracChangeset for help on using the changeset viewer.