Ignore:
Timestamp:
Mar 12, 2007, 12:23:16 AM (13 years ago)
Author:
Bruno Cornec
Message:

Port from stable important patches for 2.2.2:
mindi-busybox:

  • Improve Gentoo packaging

mindi:

  • Better messages for analyze-my-lvm
  • Add support for newer Qlogic drivers (qla2300 & 2400), mpt, dm and ohci
  • Fix a bug in mindi for the FAILSAFE support
  • PATH fixed for init in restore (/usr/games added for petris)
  • Fiw a bug where restore failing because no archive files are found when -G is used
  • /media is now completely excluded as per StandardsCompliance

mondo:

  • Handle no compression + verify correctly
  • various HOWTO fixes
  • Fix temporarily a bug when a biggiefile > 32MB was compressed below the size

of a slice (16MB)

  • Better module loading in insmod_crucial_modules
  • Improve Gentoo packaging
  • Small typo fix for mondorestore man page
  • Small memory management improvements
  • Store NFS config only once
  • Fix a flaw in libmondo-mountlist.c (there since rev [1] !!)
  • Increased MAX_STR_LEN to 384 to make it divisible without remainder by eight

for 64 bits platforms

  • Fix a bug where no bzip2 format file would be found when supporting gzip
  • CentOS fixes
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.2/mondo/src/common/libmondo-verify.c

    r1003 r1236  
    369369           does_file_exist(slice_fname
    370370                           (bigfile_num, slice_num, mountpoint, ""))) {
    371 // handle slices until end of CD
     371        // handle slices until end of CD
    372372        if (slice_num == 0) {
    373373            log_msg(2, "ISO=%d  bigfile=%ld --START--",
     
    391391            if (!(forig = fopen(tmp, "r"))) {
    392392                log_msg(2, "Failed to open bigfile. Darn.");
     393                log_to_screen(_("%s/%s not found on live filesystem"),
     394                            bkpinfo->restore_path,
     395                            biggiestruct.filename);
     396                asprintf(&tmp, "echo \"%s/%s not found\" >> /tmp/biggies.changed",
     397                            bkpinfo->restore_path,
     398                            biggiestruct.filename);
     399                system(tmp);
     400                paranoid_free(tmp);
     401
     402                bigfile_num++;
     403                slice_num = 0;
    393404                retval++;
     405            } else {
     406                slice_num++;
    394407            }
    395             slice_num++;
    396         } else if (does_file_exist
    397                    (slice_fname(bigfile_num, slice_num, mountpoint, ""))) {
     408            paranoid_free(tmp2);
     409        } else if (does_file_exist(slice_fname(bigfile_num, slice_num, mountpoint, "")) &&
     410                   (length_of_file(slice_fname(bigfile_num, slice_num, mountpoint, "")) == 0)) {
    398411            log_msg(2, "ISO=%d  bigfile=%ld ---END---",
    399412                    g_current_media_number, bigfile_num);
     
    402415            slice_num = 0;
    403416        } else {
    404             log_msg(2, "ISO=%d  bigfile=%ld  slice=%ld  \r",
     417            mr_msg(2, "ISO=%d  bigfile=%ld  slice=%ld",
    405418                    g_current_media_number, bigfile_num, slice_num);
    406             if (bkpinfo->compression_level > 0) {
     419            if (!does_file_exist(slice_fname(bigfile_num, slice_num, mountpoint, ""))) {
    407420                sprintf(command, "%s -dc %s 2>> %s",
    408421                        sz_exe,
    409                         slice_fname(bigfile_num, slice_num, mountpoint,
    410                                     bkpinfo->zip_suffix),
     422                        slice_fname(bigfile_num, slice_num, mountpoint, bkpinfo->zip_suffix),
    411423                        MONDO_LOGFILE);
    412424            } else {
    413                 sprintf(command, "cat %s",
    414                         slice_fname(bigfile_num, slice_num, mountpoint,
    415                                     bkpinfo->zip_suffix));
     425                sprintf(command, "cat %s 2>> %s",
     426                        slice_fname(bigfile_num, slice_num, mountpoint, ""), MONDO_LOGFILE);
    416427            }
    417428            if ((pin = popen(command, "r"))) {
     
    435446                }
    436447                paranoid_pclose(pin);
    437                 if (res && !strncmp(biggiestruct.filename, " /dev/", 5)) {
     448                if (res && !strncmp(biggiestruct.filename, "/dev/", 5)) {
    438449                    log_msg(3,
    439450                            "Ignoring differences between %s and live filesystem because it's a device and therefore the archives are stored via ntfsclone, not dd.",
Note: See TracChangeset for help on using the changeset viewer.