Changeset 1302 in MondoRescue

Timestamp:

Apr 15, 2007, 1:57:44 AM (18 years ago)

Author:

Bruno Cornec

Message:

• RAM size needs to be bigger on FC6
• Attempt to fix a core dumped when a Big file doesn't exist and we're unable to create it (report from Nic Watson mondo_at_nicwatson.org)
• NFS needs the fscache module on FC6 (at least)
• Use build_partition_name and remove superfluous test (still try to solve cciss gap issue)

Location:

branches/stable

Files:

• mindi/README.pxe (modified) (1 diff)
• mindi/distributions/conf/mindi.conf.dist (modified) (1 diff)
• mondo/src/common/libmondo-archive.c (modified) (1 diff)
• mondo/src/common/libmondo-mountlist.c (modified) (1 diff)

branches/stable/mindi/README.pxe

@@ -11 +11 @@
 label mondo
         kernel vmlinuz-mondo
-        append initrd=initrd-mondo load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=36864 rw root=/dev/ram iso_mode acpi=off apm=off devfs=nomount exec-shield=0 pxe [prefix=machine] [ipconf=(ipdev:ipadr:netmask:broadcast:gateway|ipdev:dhcp)] [nfsmount=server:mountpoint] [ping=#] ...
+        append initrd=initrd-mondo load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=65535 rw root=/dev/ram iso_mode acpi=off apm=off devfs=nomount exec-shield=0 pxe [prefix=machine] [ipconf=(ipdev:ipadr:netmask:broadcast:gateway|ipdev:dhcp)] [nfsmount=server:mountpoint] [ping=#] ...
 
 ipdev is the device name (e.g. eth2)

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

@@ -114 +114 @@
 mindi_tape_mods="ht st osst ide-tape ide_tape"
 mindi_floppy_mods="ide-floppy floppy"
-mindi_net_mods="sunrpc nfs nfs_acl lockd loop mii 3c59x e100 bcm5700 bnx2 e1000 eepro100 ne2k-pci tg3 pcnet32 8139cp 8139too 8390 vmxnet vmnet"
+mindi_net_mods="sunrpc nfs nfs_acl lockd fscache loop mii 3c59x e100 bcm5700 bnx2 e1000 eepro100 ne2k-pci tg3 pcnet32 8139cp 8139too 8390 vmxnet vmnet"
 mindi_extra_mods="vfat fat loop md-mod linear raid0 raid1 xor raid5 raid456 lvm-mod dm-mod dm-snapshot dm-zero dm-mirror jfs xfs xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfs_acl nfsd lockd sunrpc jbd mbcache"
 #

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

@@ -2098 +2098 @@
         if (!does_file_exist(bigfile_fname)) {
             ftmp = fopen(bigfile_fname, "w");
-            paranoid_fclose(ftmp);
+            if (ftmp == NULL) {
+                mr_msg(3, "Unable to write to %s", bigfile_fname);
+                // So skip it as it doesn't exist
+                continue;
+            } else {
+                paranoid_fclose(ftmp);
+            }
             delete_when_done = TRUE;
         } else {

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

@@ -411 +411 @@
 
     for (curr_part_no = 1; curr_part_no < 99; curr_part_no++) {
-        if ((strstr(device, "/cciss/") != NULL) ||
-            (strstr(device, "/ataraid/") != NULL) ||
-            (strstr(device, "/ida/") != NULL) ||
-            (strstr(device, "/rd/") != NULL)) {
-                mr_asprintf(&device, "%sp%d", drive, curr_part_no);
-                sprintf(device, "%sp%d", drive, curr_part_no);
-            } else {    
-                mr_asprintf(&device, "%s%d", drive, curr_part_no);
-            }
+        malloc_string(device);
+        build_partition_name(device, drive, curr_part_no);
         pos = find_device_in_mountlist(mountlist, device);
         if (pos < 0) {
-            continue;
-        }
-        if (physical_drive_size < 0) {
-            mr_asprintf(&tmp, " %s refers to non-existent hardware.", device);
-            log_it(tmp);
-            strcat(flaws_str, tmp);
-            res++;
-            mr_free(tmp);
             continue;
         }