Changeset 3377 in MondoRescue for branches/3.2/mondo/src/mondorestore/mondo-prep.c

Timestamp:

May 6, 2015, 1:10:17 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Rename mr_parted2fdisk to mr-parted2fdisk for consistency with all other new mr-* commands
• Adds functions mr_center_string and mr_popup_and_get_string with dynamic allocation to solve a memory allocation issue reported on the ML
• Fix mr_boot_type to detect correctly a UEFI based system

File:

• branches/3.2/mondo/src/mondorestore/mondo-prep.c (modified) (3 diffs)

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

@@ -1347 +1347 @@
 #else
 make_hole_for_file(FDISK_LOG);
-mr_asprintf(tmp, "mr_parted2fdisk %s >> %s 2>> %s", drivename, FDISK_LOG, FDISK_LOG);
+mr_asprintf(tmp, "mr-parted2fdisk %s >> %s 2>> %s", drivename, FDISK_LOG, FDISK_LOG);
 pout_to_fdisk = popen(tmp, "w");
 if (!pout_to_fdisk) {
-    log_to_screen("Cannot call mr_parted2fdisk to configure %s", drivename);
+    log_to_screen("Cannot call mr-parted2fdisk to configure %s", drivename);
     mr_free(tmp);
     return (1);
@@ -1587 +1587 @@
 
 
-mr_asprintf(program, "mr_parted2fdisk %s >> %s 2>> %s", drive, MONDO_LOGFILE, MONDO_LOGFILE);
+mr_asprintf(program, "mr-parted2fdisk %s >> %s 2>> %s", drive, MONDO_LOGFILE, MONDO_LOGFILE);
 
 /* BERLIOS: should not be called each time */
@@ -1906 +1906 @@
     } else {
         mr_asprintf(output, "t\n%d\n%s\nw\n", partno, partcode);
-        mr_asprintf(command, "mr_parted2fdisk %s >> %s 2>> %s", drive, MONDO_LOGFILE, MONDO_LOGFILE);
+        mr_asprintf(command, "mr-parted2fdisk %s >> %s 2>> %s", drive, MONDO_LOGFILE, MONDO_LOGFILE);
         log_msg(5, "output = '%s'", output);
         log_msg(5, "partno=%d; partcode=%s", partno, partcode);