Changeset 1236 in MondoRescue for branches/2.2.2/mondo/src/common/libmondo-verify.c

Timestamp:

Mar 12, 2007, 12:23:16 AM (17 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:

• branches/2.2.2/mondo/src/common/libmondo-verify.c (modified) (4 diffs)

branches/2.2.2/mondo/src/common/libmondo-verify.c

@@ -369 +369 @@
            does_file_exist(slice_fname
                            (bigfile_num, slice_num, mountpoint, ""))) {
-// handle slices until end of CD
+        // handle slices until end of CD
         if (slice_num == 0) {
             log_msg(2, "ISO=%d  bigfile=%ld --START--",
@@ -391 +391 @@
             if (!(forig = fopen(tmp, "r"))) {
                 log_msg(2, "Failed to open bigfile. Darn.");
+                log_to_screen(_("%s/%s not found on live filesystem"),
+                            bkpinfo->restore_path,
+                            biggiestruct.filename);
+                asprintf(&tmp, "echo \"%s/%s not found\" >> /tmp/biggies.changed",
+                            bkpinfo->restore_path,
+                            biggiestruct.filename);
+                system(tmp);
+                paranoid_free(tmp);
+
+                bigfile_num++;
+                slice_num = 0;
                 retval++;
+            } else {
+                slice_num++;
             }
-            slice_num++;
-        } else if (does_file_exist
-                   (slice_fname(bigfile_num, slice_num, mountpoint, ""))) {
+            paranoid_free(tmp2);
+        } else if (does_file_exist(slice_fname(bigfile_num, slice_num, mountpoint, "")) &&
+                   (length_of_file(slice_fname(bigfile_num, slice_num, mountpoint, "")) == 0)) {
             log_msg(2, "ISO=%d  bigfile=%ld ---END---",
                     g_current_media_number, bigfile_num);
@@ -402 +415 @@
             slice_num = 0;
         } else {
-            log_msg(2, "ISO=%d  bigfile=%ld  slice=%ld  \r",
+            mr_msg(2, "ISO=%d  bigfile=%ld  slice=%ld",
                     g_current_media_number, bigfile_num, slice_num);
-            if (bkpinfo->compression_level > 0) {
+            if (!does_file_exist(slice_fname(bigfile_num, slice_num, mountpoint, ""))) {
                 sprintf(command, "%s -dc %s 2>> %s",
                         sz_exe,
-                        slice_fname(bigfile_num, slice_num, mountpoint,
-                                    bkpinfo->zip_suffix),
+                        slice_fname(bigfile_num, slice_num, mountpoint, bkpinfo->zip_suffix),
                         MONDO_LOGFILE);
             } else {
-                sprintf(command, "cat %s",
-                        slice_fname(bigfile_num, slice_num, mountpoint,
-                                    bkpinfo->zip_suffix));
+                sprintf(command, "cat %s 2>> %s",
+                        slice_fname(bigfile_num, slice_num, mountpoint, ""), MONDO_LOGFILE);
             }
             if ((pin = popen(command, "r"))) {
@@ -435 +446 @@
                 }
                 paranoid_pclose(pin);
-                if (res && !strncmp(biggiestruct.filename, " /dev/", 5)) {
+                if (res && !strncmp(biggiestruct.filename, "/dev/", 5)) {
                     log_msg(3,
                             "Ignoring differences between %s and live filesystem because it's a device and therefore the archives are stored via ntfsclone, not dd.",