Changeset 1066 in MondoRescue

Timestamp:

Jan 23, 2007, 7:35:35 AM (18 years ago)

Author:

Bruno Cornec

Message:

get rid of my-stuff.h under src/common
Try to add 3ware driver again
test updated

Location:

branches/stable

Files:

• mindi/distributions/conf/mindi.conf.dist (modified) (1 diff)
• mondo/src/common/my-stuff.h (deleted)
• mondo/src/include/my-stuff.h (modified) (4 diffs)
• mondo/src/test/test-msg.res (modified) (1 diff)

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

@@ -86 +86 @@
 # Modules supported by mindi and required at boot time 
 #
-mindi_scsi_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 i2o_block i2o_core ide-scsi ieee1394 imm in2000 initio ips iscsi isp megaraid mptbase mptscsih mptsas mptspi mptfc mptscsi mptctl NCR53c406a ncr53c8xx nsp32 pas16 pci2000 pci2220i pcmcia ppa psi240i qla1280 qla2200 qla2300 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 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 i2o_block i2o_core ide-scsi ieee1394 imm in2000 initio ips iscsi isp megaraid mptbase mptscsih mptsas mptspi mptfc mptscsi mptctl NCR53c406a ncr53c8xx nsp32 pas16 pci2000 pci2220i pcmcia ppa psi240i qla1280 qla2200 qla2300 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_ide_mods="ide ide-generic ide-detect ide-mod ide-disk ide-cd ide_cd ide-cs ide-core ide_core edd paride ata_piix libata via82cxxx generic nvidia ahci sata_nv"
 mindi_usb_mods="usb-storage usb-ohci usb-uhci usbcore usb_storage hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd ohci-hcd ohci_hcd usbkbd usbhid"

branches/stable/mondo/src/include/my-stuff.h

@@ -53 +53 @@
 
 #include <stdlib.h>
-/* BERLIOS
-#ifndef  __USE_FILE_OFFSET64
-#define  __USE_FILE_OFFSET64
-#endif
-#ifndef  __USE_LARGEFILE64
-#define  __USE_LARGEFILE64
-#endif
-*/
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -79 +71 @@
 #endif
 #include <assert.h>
-
-/*
-#if defined(DEBUG) && !__cplusplus
-int count;
-char trace_log[255];
-char *trace_log_ptr;
-#endif
-*/
 
 #define STD_PREFIX "mondorescue"
@@ -210 +194 @@
 
 /**
- * @c mkisofs command to generate a bootable CD using LILO, except for -o option and the directory to image.
- */
-// -b images/mindi-boot.2880.img
-
-/**
- * @c mkisofs command to generate a bootable CD using ELILO, except for -o option and the directory to image.
- */
-// -b images/mindi-boot.2880.img
-// Should replace 8192 by IA64_BOOT_SIZE
-
-/**
  * The stub name of the temporary ISO image to create, burn, and remove.
  */
@@ -332 +305 @@
 #define VANILLA_SCSI_CDROM  "/dev/cd0"
 #define VANILLA_SCSI_TAPE   "/dev/sa"
+#define VANILLA_USB_DEVICE  "/dev/hda"
 #define DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE  "/dev/vinum/"
 #define RAID_DEVICE_STUB    DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE

branches/stable/mondo/src/test/test-msg.res

@@ -1 +1 @@
 Logfile : ***/tmp/mondo-test.log***
 Loglevel : ***3***
-../lib/mr_msg.c->mr_msg#75: Log sentence : 12 3 /tmp/mondo-test.log is a log file
+../lib/mr_msg.c->mr_msg#76: Log sentence : 12 3 /tmp/mondo-test.log is a log file