Changeset 1304 in MondoRescue for branches/stable/mondo/src/mondorestore

Timestamp:

Apr 15, 2007, 2:43:15 AM (17 years ago)

Author:

Bruno Cornec

Message:

• Some FreeBSD fixes
• Better messages for partition names
• May improve the gap issue on cciss

File:

• branches/stable/mondo/src/mondorestore/mondo-prep.c (modified) (5 diffs)

branches/stable/mondo/src/mondorestore/mondo-prep.c

@@ -1041 +1041 @@
 
     if (devno_we_must_allow_for >= 5) {
-        log_it("Making dummy primary %s%d", drivename, 1);
+        log_it("Making dummy primary 1 on %s", drivename);
         g_maximum_progress++;
         res =
@@ -1054 +1054 @@
     }
     for (; current_devno < devno_we_must_allow_for; current_devno++) {
-        log_it("Creating dummy partition %s%d", drivename, current_devno);
+        log_it("Creating dummy partition %d on %s", current_devno, drivename);
         g_maximum_progress++;
         res =
@@ -1709 +1709 @@
         mr_asprintf(&tmp, last_line_of_file(FDISK_LOG));
         if (strstr(tmp, " (m ")) {
-            mr_msg(1, "Successfully created %s%d", drive, partno);
+            mr_msg(1, "Successfully created partition %d on %s", partno, drive);
         } else {
             mr_msg(1, "last line = %s", tmp);
-            mr_msg(1, "Failed to create %s%d; sending 'Enter'...", drive,
-                    partno);
+            mr_msg(1, "Failed to create partition %d on %s; sending 'Enter'...", partno, drive);
         }
         mr_free(tmp);
 
         if (!retval) {
-            mr_msg(1, "Trying to set %s%d's partition type now", drive,
-                    partno);
+            mr_msg(1, "Trying to set partition %d type now on %s", partno, drive);
             retval =
                 set_partition_type(pout_to_fdisk, drive, partno, format,
@@ -1920 +1918 @@
     } else if (strcmp(format, "ext2") == 0
                || strcmp(format, "reiserfs") == 0
-               || strcmp(format, "ext3") == 0 || strcmp(format, "xfs") == 0
+               || strcmp(format, "ext3") == 0 
+               || strcmp(format, "xfs") == 0
                || strcmp(format, "jfs") == 0) {
         mr_asprintf(&partcode, "83");
@@ -2295 +2294 @@
              strlen(drive_name)) == 0) {
             original_size_of_drive += mountlist->el[partno].size;
+        } else {
+            sprintf(tmp, "Skipping %s", mountlist->el[partno].device);
+            log_to_screen(tmp);
         }
     }