Ignore:
Timestamp:
May 6, 2015, 1:10:17 PM (5 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:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.2/mondo/src/mondorestore/mondo-prep.c

    r3371 r3377  
    13471347#else
    13481348make_hole_for_file(FDISK_LOG);
    1349 mr_asprintf(tmp, "mr_parted2fdisk %s >> %s 2>> %s", drivename, FDISK_LOG, FDISK_LOG);
     1349mr_asprintf(tmp, "mr-parted2fdisk %s >> %s 2>> %s", drivename, FDISK_LOG, FDISK_LOG);
    13501350pout_to_fdisk = popen(tmp, "w");
    13511351if (!pout_to_fdisk) {
    1352     log_to_screen("Cannot call mr_parted2fdisk to configure %s", drivename);
     1352    log_to_screen("Cannot call mr-parted2fdisk to configure %s", drivename);
    13531353    mr_free(tmp);
    13541354    return (1);
     
    15871587
    15881588
    1589 mr_asprintf(program, "mr_parted2fdisk %s >> %s 2>> %s", drive, MONDO_LOGFILE, MONDO_LOGFILE);
     1589mr_asprintf(program, "mr-parted2fdisk %s >> %s 2>> %s", drive, MONDO_LOGFILE, MONDO_LOGFILE);
    15901590
    15911591/* BERLIOS: should not be called each time */
     
    19061906    } else {
    19071907        mr_asprintf(output, "t\n%d\n%s\nw\n", partno, partcode);
    1908         mr_asprintf(command, "mr_parted2fdisk %s >> %s 2>> %s", drive, MONDO_LOGFILE, MONDO_LOGFILE);
     1908        mr_asprintf(command, "mr-parted2fdisk %s >> %s 2>> %s", drive, MONDO_LOGFILE, MONDO_LOGFILE);
    19091909        log_msg(5, "output = '%s'", output);
    19101910        log_msg(5, "partno=%d; partcode=%s", partno, partcode);
Note: See TracChangeset for help on using the changeset viewer.