Changeset 2125 in MondoRescue for branches/2.2.8/mondo/src/mondorestore/mondo-prep.c

Timestamp:

Jan 14, 2009, 3:50:19 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Changes the way to compute original_size_of_drive in mondo-prep.c to correspond to the way it's done in libmondo-mountlist.c, and thus avoiding aborting nuje mode for 2 MB (which could come from adjustements in computation)

File:

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

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

@@ -2457 +2457 @@
 
     /** long *************************************************************/
-    long newsizL;
+    long newsizL = 0L;
     long current_size_of_drive = 0L;
     long original_size_of_drive = 0L;
-    long final_size;            /* all in Megabytes */
+    long final_size = 0L;           /* all in Megabytes */
     struct mountlist_reference *drivemntlist;
 
@@ -2479 +2479 @@
     }
 
-    /*
-       sprintf (tmp, "cp -f %s %s.pre-resize", g_mountlist_fname, g_mountlist_fname);
-       run_program_and_log_output (tmp, FALSE);
-     */
-
     current_size_of_drive = get_phys_size_of_drive(drive_name);
 
@@ -2505 +2500 @@
 
     for (partno = 0; partno < drivemntlist->entries; partno++) {
-        original_size_of_drive += drivemntlist->el[partno]->size;
-    }
-    original_size_of_drive = original_size_of_drive / 1024;
+        if (drivemntlist->el[partno]->size > 0) {
+            original_size_of_drive += (drivemntlist->el[partno]->size / 1024L);
+        }
+    }
 
     if (original_size_of_drive <= 0) {
@@ -2540 +2536 @@
             newsizL = (long) new_size;
         }
+
+        /* Do not apply the factor if partition was of negative size */
+        if (newsizL < 0) {
+            newsizL = drivemntlist->el[partno]->size;
+        }
+
         sprintf(tmp, "Changing %s from %lld KB to %ld KB",
                 drivemntlist->el[partno]->device,
@@ -2548 +2550 @@
     final_size = get_phys_size_of_drive(drive_name);
     sprintf(tmp, "final_size = %ld MB", final_size);
+    log_to_screen(tmp);
     paranoid_free(tmp);
-    log_to_screen(tmp);
 }