Changeset 2453 in MondoRescue

Timestamp:

Oct 7, 2009, 10:17:03 AM (15 years ago)

Author:

Bruno Cornec

Message:

• 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)

File:

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

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

@@ -1696 +1696 @@
         /* 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");
         strcpy(partitions[0], dsf);
         ndsf = truncate_to_drive_name(dsf);
@@ -1954 +1954 @@
             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");
         }
@@ -1967 +1968 @@
                 strcat(bkpinfo->exclude_paths, " ");
                 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);
-                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, "");
-                }
+            }
+        } 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, "");
             }
         }