Changeset 1304 in MondoRescue

Timestamp:

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

Author:

Bruno Cornec

Message:

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

Location:

branches/stable/mondo/src

Files:

• common/libmondo-devices.c (modified) (1 diff)
• common/libmondo-mountlist.c (modified) (6 diffs)
• mondorestore/mondo-prep.c (modified) (5 diffs)

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

@@ -397 +397 @@
 #ifdef __FreeBSD__
     // We assume here that this is running from mondorestore. (It is.)
-    // BERLIOS: This is BROKEN - 1 %s - 2 params !!
-    mr_asprintf(&program, "ls %s >/dev/null 2>&1", drive,
+    mr_asprintf(&program, "ls %s %s >/dev/null 2>&1", drive,
             build_partition_name(tmp, drive, partno));
     res = system(program);

branches/stable/mondo/src/common/libmondo-mountlist.c

@@ -165 +165 @@
     npos = pos = 0;
     for (curr_part_no = 1; curr_part_no < 99; curr_part_no++) {
-        mr_asprintf(&device, "%ss%d", drive, curr_part_no);
+        malloc_string(device);
+        build_partition_name(device, drive, curr_part_no);
         pos = find_device_in_mountlist(mountlist, device);
         npos = 0;
@@ -182 +183 @@
         }
 
-        mr_asprintf(&device, "%ss%d", drive, curr_part_no);
-        // BERLIOS : useless ? mr_asprintf(&mountpoint, mountlist->el[pos].mountpoint);
+        build_partition_name(device, drive, curr_part_no);
         if (pos > 0 && !npos) {
             /* gap in the partition list? */
@@ -417 +417 @@
             continue;
         }
-        // BERLIOS : useless ? str-cpy(mountpoint, mountlist->el[pos].mountpoint);
         /* gap in the partition list? */
         if (curr_part_no - prev_part_no > 1) {
@@ -428 +427 @@
             } else if (curr_part_no > 5
                        || (curr_part_no <= 4 && prev_part_no > 0)) {
-                mr_asprintf(&tmp, " Gap between %s%d and %d.", drive,
+                mr_asprintf(&tmp, " Gap on %s between %d and %d.", drive,
                         prev_part_no, curr_part_no);
                 log_it(tmp);
@@ -441 +440 @@
         if ((curr_part_no >= 5 && prev_part_no == 4)
             && (strcmp(part_table_fmt, "MBR") == 0)) {
-            mr_asprintf(&tmp, " Partition %s4 is occupied.", drive);
+            mr_asprintf(&tmp, " Partition 4 of %s is occupied.", drive);
             log_it(tmp);
             strcat(flaws_str, tmp);
@@ -497 +496 @@
         prev_part_no = curr_part_no;
         mr_free(device);
+
     }
 

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);
         }
     }