Changeset 1508 in MondoRescue

Timestamp:

Jun 20, 2007, 1:25:01 AM (17 years ago)

Author:

Bruno Cornec

Message:

• Add scsi_transport_sas to SCSI_MODS for LSI SAS1064E on CentOS 5 (Brandon Poyner bpoyner_at_ccac.edu)
• Fix a bug on the MODULE variable and grep -F usage with spaces.
• Fix Virtual media usage (Patrick Albert)
• Also computes number of media for NFS backups
• Do not launch 64 bits versions if called with specific VMs
• Improve message around ISO directory (Patrick Albert and Bryan Gartner)
• Fix mondo mailing list archive link
• Ubuntu version is 6.06

Location:

branches/stable

Files:

• mindi/distributions/conf/mindi.conf.dist (modified) (1 diff)
• mindi/mindi (modified) (1 diff)
• mondo/src/common/libmondo-devices.c (modified) (1 diff)
• mondo/src/common/libmondo-files.c (modified) (1 diff)
• tools/DISTROS (modified) (1 diff)
• tools/build2qemu (modified) (2 diffs)
• tools/quality (modified) (1 diff)

branches/stable/mindi/distributions/conf/mindi.conf.dist

@@ -107 +107 @@
 # Modules supported by mindi and required at boot time 
 #
-mindi_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 isp megaraid megaraid_mm megaraid_mbox mptbase mptscsih mptsas mptspi mptfc mptscsi mptctl NCR53c406a ncr53c8xx nsp32 pas16 pci2000 pci2220i pcmcia ppa psi240i qla1280 qla2200 qla2300 qla2xxx qla2xxx_conf 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"
+mindi_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 isp megaraid megaraid_mm megaraid_mbox mptbase mptscsih mptsas mptspi mptfc mptscsi mptctl NCR53c406a ncr53c8xx nsp32 pas16 pci2000 pci2220i pcmcia ppa psi240i qla1280 qla2200 qla2300 qla2xxx qla2xxx_conf qlogicfas qlogicfc qlogicisp raw1394 scsi_debug scsi_mod scsi_transport_sas sd_mod seagate sg sim710 sr_mod sym53c416 sym53c8xx sym53c8xx_2 t128 tmscsim u14-34f ultrastor wd7000 vmhgfs"
 mindi_ide_mods="ide ide-generic ide-detect ide-mod ide-disk ide-cd ide_cd ide-cs ide-core ide_core edd paride ata_generic ata_piix libata via82cxxx generic nvidia ahci sata_nv cmd64x"
 mindi_usb_mods="usb-storage usb-ohci usb-uhci usbcore usb_storage input hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd ohci-hcd ohci_hcd usbkbd usbhid keybdev mousedev"

branches/stable/mindi/mindi

@@ -2822 +2822 @@
     loaded_modules="$MODULES"
     for modname in $1 ; do
-        [ "`echo "$loaded_modules" | grep -F " $modname "`" ] && echo "$modname"
+        [ "`echo "$loaded_modules" | grep -w "$modname"`" ] && echo "$modname"
     done
 }

branches/stable/mondo/src/common/libmondo-devices.c

@@ -1797 +1797 @@
             if (!popup_and_get_string
                 ("Storage dir.",
-                 "Please enter the full path that contains your ISO images.  Example: /mnt/raid0_0",
+                 "Please enter the full path name to the directory for your ISO images.  Example: /mnt/raid0_0",
                  bkpinfo->isodir, MAX_STR_LEN / 4)) {
                 log_to_screen("User has chosen not to backup the PC");

branches/stable/mondo/src/common/libmondo-files.c

@@ -1163 +1163 @@
     long long scratchLL;
 
-    if (bkpinfo->media_size <= 0L || bkpinfo->backup_media_type == nfs) {
+    if (bkpinfo->media_size <= 0L) {
         log_to_screen("Number of media required: UNKNOWN");
         return;

branches/stable/tools/DISTROS

@@ -20 +20 @@
 debian_3.1
 debian_4.0
-ubuntu_6.04
+ubuntu_6.06
 ubuntu_7.04
 gentoo_1.6

branches/stable/tools/build2qemu

@@ -69 +69 @@
 if [ $single -eq 0 ]; then
     $TOOLHOME/file2ftp
+    ALLVMS="$VMS $VMS64"
+else
+    ALLVMS="$VMS"
 fi
 
@@ -77 +80 @@
 tar cfz $MONDOTMP/mkmondo.tar.gz $TOOLHOME $MONDOTMP/mkmondo $dir/${VER}-$TAG
 
-for m in $VMS $VMS64; do
+for m in $ALLVMS; do
     echo "Working on $m"
     vmp=0

branches/stable/tools/quality

@@ -51 +51 @@
 find . -name '*.c' -o -name '*.h' | xargs splint +posixlib -Dlinux -I$TOOLHOME/../mondo/src/include
 
+echo " "
+echo "LoC: "
+for i in `find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn|/\*|monitas|mindi-busybox' `; do
+    echo " === $i"
+    ((tot=$tot+`echo $i | cut -d: -f2`))
+done
+echo "total $s usage : $tot"
 rm -f /tmp/mondo.quality