Changeset 3570 in MondoRescue for branches

Timestamp:

Apr 26, 2016, 3:08:04 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Fix #796 by limiting the requirement for une extended partition to MBR disks

File:

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

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

@@ -1287 +1287 @@
 int i;
 FILE *pout_to_fdisk = NULL;
+char *part_table_fmt = NULL;
 
 #ifdef __FreeBSD__
@@ -1437 +1438 @@
 
 #ifndef __IA64__
-    /* TODO: In GPT and NOT in IA64 this is failse ! */
-    if (current_devno == 5 && previous_devno == 4) {
-        log_to_screen("You must leave at least one partition spare as the Extended partition.");
-        paranoid_free(device_str);
-        mr_free(format);
-        return (1);
-    }
+    part_table_fmt = which_partition_format(drivename);
+
+    /* MBR needs an extended partition if more than 4 partitions */
+    if (strcmp(part_table_fmt, "MBR") == 0) {
+        if (current_devno == 5 && previous_devno == 4) {
+            log_to_screen("You must leave at least one partition spare as the Extended partition.");
+            paranoid_free(device_str);
+            mr_free(format);
+            return (1);
+        }
+    }
+    mr_free(part_table_fmt);
 #endif