Changeset 2460 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-devices.c

Timestamp:

Oct 9, 2009, 3:18:59 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Adds a conf file example for mindi and fix #360 + mode of file
• Apply path from Matthew Cline (matt_at_nightrealms.com) in order to fix #359
• Adds support for libcrc32c (needed by bnx2x)
• afio is under /bin on Debian
• Fix an error in the test for grub conf files (or used instead of and)
• Fix a bug in handling of -E option with real devices (bad report in function mr_make_devlist_from_pathlist of the test between -E and -I)
• CIFS mounts shouldn't be part of the mountlist analysis (should help solving #288)

File:

• branches/2.2.10/mondo/src/common/libmondo-devices.c (modified) (3 diffs)

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

@@ -1632 +1632 @@
         /* There were no partitions on the disk */
         log_msg(4, "No partitions on device special file %s", dsf);
-        log_msg(4, "I guess it's a partiion itself");
+        log_msg(4, "I guess it's a partition itself");
         mr_asprintf(partitions[0], "%s", dsf);
         mr_asprintf(tmp, "%s", dsf);
@@ -1914 +1914 @@
             log_msg(1, "WARNING ! %s doesn't exist in -E option", token);
         } else {
+            log_msg(1, "ERROR ! %s doesn't exist in -I option", token);
             fatal_error("Error processing -I option");
         }
@@ -1926 +1927 @@
                 mr_strcat(bkpinfo->exclude_paths, "%s ", mounted_on_dsf);
                 mr_strcat(bkpinfo->exclude_devs, " %s ", token);
-            } else {
-                log_to_screen("Archiving only the following file systems on %s:\n", token);
-                log_to_screen("  %s\n", mounted_on_dsf);
-                mr_asprintf(bkpinfo->include_paths, "/");
-                if (strlen(not_mounted_on_dsf)) {
-                    log_msg (5, "Adding to bkpinfo->exclude_paths due to -I option: %s", not_mounted_on_dsf);
-                    log_to_screen("Not archiving the following file systems:\n");
-                    log_to_screen("  %s\n", not_mounted_on_dsf);
-                    mr_strcat(bkpinfo->exclude_paths, "%s ", not_mounted_on_dsf);
-                }
+            }
+        } else {
+            log_to_screen("Archiving only the following file systems on %s:\n", token);
+            log_to_screen("  %s\n", mounted_on_dsf);
+            strcpy(bkpinfo->include_paths, "/");
+            if (strlen(not_mounted_on_dsf)) {
+                log_msg (5, "Adding to bkpinfo->exclude_paths due to -I option: %s", not_mounted_on_dsf);
+                log_to_screen("Not archiving the following file systems:\n");
+                log_to_screen("  %s\n", not_mounted_on_dsf);
+                strcat(bkpinfo->exclude_paths, not_mounted_on_dsf);
+                strcat(bkpinfo->exclude_paths, "");
             }
         }