Changeset 3553 in MondoRescue for branches/3.2/mondo/src/common/libmondo-devices.c

Timestamp:

Apr 7, 2016, 3:47:44 AM (8 years ago)

Author:

Bruno Cornec

Message:

Help Fix #790

• Fix perl functions to handle disk type (MBR vs GPT) on RHEL7 and unify output format
• Adds perl function to list all disks on the system
• Adds perl program to unit test these functions
• which_partition_format now uses mr-disk-type

File:

• branches/3.2/mondo/src/common/libmondo-devices.c (modified) (1 diff)

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

@@ -3316 +3316 @@
 {
     char *output = NULL;
-    char *tmp = NULL;
     char *command = NULL;
-    mr_asprintf(command, "mr-parted2fdisk -l %s 2>/dev/null | grep 'EFI GPT'", drive);
-    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
+    mr_asprintf(command, "mr-disk-type %s", drive);
+    mr_asprintf(output, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
-
-    if (strstr(tmp, "GPT") == NULL) {
-        mr_asprintf(output, "%s", "MBR");
-    } else {
-        mr_asprintf(output, "%s", "GPT");
-    }
-    mr_free(tmp);
 
     log_msg(0, "Found %s partition table format type on %s", output, drive);