Changeset 2481 in MondoRescue

Timestamp:

Nov 12, 2009, 2:33:39 AM (14 years ago)

Author:

Bruno Cornec

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:

• mindi/README.bootparam (modified) (1 diff)
• mindi/mindi (modified) (3 diffs)
• mindi/rootfs/sbin/init (modified) (1 diff)
• mondo/src/common/libmondo-archive.c (modified) (2 diffs)
• mondo/src/mondorestore/mondo-prep.c (modified) (1 diff)

branches/2.2.10/mindi/README.bootparam

@@ -39 +39 @@
     Do not call the mindi-rsthw script which try to restore also your BIOSes configuration (Proliant only)
 
+nolvm
+    Do not try to start LVM support
+
 nomd
     Do not try to start mdadm support

branches/2.2.10/mindi/mindi

@@ -53 +53 @@
 MY_FSTAB=/etc/fstab
 TAPE_MODS="ht st osst ide-tape ide_tape"
-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"
+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 diskdumplib"
 
 # ide-probe-mod
@@ -1486 +1486 @@
     MakeBootConfFile syslinux > $MINDI_TMP/usb/syslinux.cfg
     echo -en "."
+    echo "----------- syslinux's conf --------------" |tee -a $LOGFILE
+    cat $MINDI_TMP/usb/syslinux.cfg |tee -a $LOGFILE
+    echo "------------------------------------------" |tee -a $LOGFILE
     umount $MINDI_TMP/usb
     if [ "$ARCH" != "ia64" ] ; then
@@ -1492 +1495 @@
             LogAll "----------- syslinux's errors --------------" |tee -a $LOGFILE
             cat $MINDI_TMP/syslinux.log |tee -a $LOGFILE
-            echo "----------- syslinux's conf --------------" |tee -a $LOGFILE
-            cat $MINDI_TMP/usb/syslinux.cfg |tee -a $LOGFILE
+            echo "------------------------------------------" |tee -a $LOGFILE
             LogAll "Failed to create USB image."
         else

branches/2.2.10/mindi/rootfs/sbin/init

@@ -387 +387 @@
 
 StartLvms() {
+    if [ "`grep -i nolvm /proc/cmdline`" ]; then
+        return;
+    fi
     if [ -e "/tmp/i-want-my-lvm" ] ; then
         LogIt "Scanning LVM's..." 1

branches/2.2.10/mondo/src/common/libmondo-archive.c

@@ -2042 +2042 @@
                        get_last_filelist_number() + 1);
 
-    for (; does_file_exist(curr_filelist_fname); curr_set_no++) {
+    for (;;) {
         /* backup this set of files */
         mr_asprintf(curr_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, curr_set_no);
@@ -2123 +2123 @@
         mr_free(curr_filelist_fname);
         mr_free(curr_afioball_fname);
+        curr_set_no++;
     }
     close_progress_form();

branches/2.2.10/mondo/src/mondorestore/mondo-prep.c

@@ -213 +213 @@
     return (0);
 #endif
+
+    tmp = call_program_and_get_last_line_of_output("cat /proc/cmdline");
+    if (strstr(tmp, "nolvm")) {
+        mr_free(tmp);
+        return(0);
+    }
+    mr_free(tmp);
 
     if (!(fin = fopen("/tmp/i-want-my-lvm", "r"))) {