installer: Add bootldr partition for GRUB2 on GPT.

diff --git a/src/install+setup/install/hw.c b/src/install+setup/install/hw.c
index a88e5567d32c56d765c7c8244a24e743803195c1..2c5ae522fe64ebda6fef50c7883b6ea58a4dde2d 100644 (file)
--- a/src/install+setup/install/hw.c
+++ b/src/install+setup/install/hw.c
@@ -337,6 +337,12 @@ static unsigned long long hw_boot_size(struct hw_destination* dest) {
 }
 
 static int hw_calculate_partition_table(struct hw_destination* dest) {
+       char path[DEV_SIZE];
+       int part_idx = 1;
+
+       snprintf(path, sizeof(path), "%s%s", dest->path, (dest->is_raid) ? "p" : "");
+       dest->part_boot_idx = 0;
+
        // Determine the size of the target block device
        if (dest->is_raid) {
                dest->size = (dest->disk1->size >= dest->disk2->size) ?
@@ -349,12 +355,38 @@ static int hw_calculate_partition_table(struct hw_destination* dest) {
                dest->size = dest->disk1->size;
        }
 
+       // Determine partition table
+       dest->part_table = HW_PART_TABLE_MSDOS;
+
+       // Disks over 2TB need to use GPT
+       if (dest->size >= MB2BYTES(2047 * 1024))
+               dest->part_table = HW_PART_TABLE_GPT;
+
+       // We also use GPT on raid disks by default
+       else if (dest->is_raid)
+               dest->part_table = HW_PART_TABLE_GPT;
+
+       // When using GPT, GRUB2 needs a little bit of space to put
+       // itself in.
+       if (dest->part_table = HW_PART_TABLE_GPT) {
+               snprintf(dest->part_bootldr, sizeof(dest->part_bootldr),
+                       "%s%d", path, part_idx);
+
+               dest->size_bootldr = MB2BYTES(4);
+
+               dest->part_boot_idx = part_idx++;
+       } else {
+               *dest->part_bootldr = '\0';
+               dest->size_bootldr = 0;
+       }
+
        dest->size_boot = hw_boot_size(dest);
        dest->size_swap = hw_swap_size(dest);
        dest->size_root = hw_root_size(dest);
 
        // Determine the size of the data partition.
-       unsigned long long used_space = dest->size_boot + dest->size_swap + dest->size_root;
+       unsigned long long used_space = dest->size_bootldr + dest->size_boot
+               + dest->size_swap + dest->size_root;
 
        // Disk is way too small
        if (used_space >= dest->size)
@@ -369,13 +401,9 @@ static int hw_calculate_partition_table(struct hw_destination* dest) {
        }
 
        // Set partition names
-       char path[DEV_SIZE];
-       int part_idx = 1;
-
-       snprintf(path, sizeof(path), "%s%s", dest->path, (dest->is_raid) ? "p" : "");
-
        if (dest->size_boot > 0) {
-               dest->part_boot_idx = part_idx;
+               if (dest->part_boot_idx == 0)
+                       dest->part_boot_idx = part_idx;
 
                snprintf(dest->part_boot, sizeof(dest->part_boot), "%s%d", path, part_idx++);
        } else
@@ -387,7 +415,7 @@ static int hw_calculate_partition_table(struct hw_destination* dest) {
                *dest->part_swap = '\0';
 
        // There is always a root partition
-       if (!*dest->part_boot)
+       if (dest->part_boot_idx == 0)
                dest->part_boot_idx = part_idx;
 
        snprintf(dest->part_root, sizeof(dest->part_root), "%s%d", path, part_idx++);
@@ -397,17 +425,6 @@ static int hw_calculate_partition_table(struct hw_destination* dest) {
        else
                *dest->part_data = '\0';
 
-       // Determine partition table
-       dest->part_table = HW_PART_TABLE_MSDOS;
-
-       // Disks over 2TB need to use GPT
-       if (dest->size >= MB2BYTES(2047 * 1024))
-               dest->part_table = HW_PART_TABLE_GPT;
-
-       // We also use GPT on raid disks by default
-       else if (dest->is_raid)
-               dest->part_table = HW_PART_TABLE_GPT;
-
        return 0;
 }
 
@@ -474,6 +491,14 @@ int hw_create_partitions(struct hw_destination* dest) {
 
        unsigned long long part_start = 1 * 1024 * 1024; // 1MB
 
+       if (*dest->part_bootldr) {
+               asprintf(&cmd, "%s mkpart %s ext2 %lluMB %lluMB", cmd,
+                       (dest->part_table == HW_PART_TABLE_GPT) ? "BOOTLDR" : "primary",
+               BYTES2MB(part_start), BYTES2MB(part_start + dest->size_bootldr));
+
+               part_start += dest->size_bootldr;
+       }
+
        if (*dest->part_boot) {
                asprintf(&cmd, "%s mkpart %s ext2 %lluMB %lluMB", cmd,
                        (dest->part_table == HW_PART_TABLE_GPT) ? "BOOT" : "primary",
@@ -510,6 +535,9 @@ int hw_create_partitions(struct hw_destination* dest) {
                asprintf(&cmd, "%s set %d boot on", cmd, dest->part_boot_idx);
 
        } else if (dest->part_table == HW_PART_TABLE_GPT) {
+               if (*dest->part_bootldr) {
+                       asprintf(&cmd, "%s set %d bios_grub on", cmd, dest->part_boot_idx);
+               }
                asprintf(&cmd, "%s disk_set pmbr_boot on", cmd);
        }
 
@@ -522,6 +550,9 @@ int hw_create_partitions(struct hw_destination* dest) {
                while (counter-- > 0) {
                        sleep(1);
 
+                       if (*dest->part_bootldr && (access(dest->part_bootldr, R_OK) != 0))
+                               continue;
+
                        if (*dest->part_boot && (access(dest->part_boot, R_OK) != 0))
                                continue;
 
@@ -778,7 +809,7 @@ int hw_install_bootloader(struct hw_destination* dest) {
        char cmd_grub[STRING_SIZE];
        snprintf(cmd_grub, sizeof(cmd_grub), "/usr/sbin/grub-install --no-floppy --recheck");
 
-       if (dest->is_raid) {
+       if (dest->is_raid && (dest->part_table == HW_PART_TABLE_MSDOS)) {
                snprintf(cmd, sizeof(cmd), "%s %s", cmd_grub, dest->disk1->path);
                r = system_chroot(DESTINATION_MOUNT_PATH, cmd);
                if (r)

diff --git a/src/install+setup/install/hw.h b/src/install+setup/install/hw.h
index 5cd4fe02602cd2411310c8f97598518098d33815..28b28dfddeb136a2109919a8b645ffab937a5837 100644 (file)
--- a/src/install+setup/install/hw.h
+++ b/src/install+setup/install/hw.h
@@ -75,6 +75,7 @@ struct hw_destination {
        const struct hw_disk* disk2;
 
        int part_table;
+       char part_bootldr[DEV_SIZE];
        char part_boot[DEV_SIZE];
        char part_swap[DEV_SIZE];
        char part_root[DEV_SIZE];
@@ -84,6 +85,7 @@ struct hw_destination {
        int filesystem;
 
        unsigned long long size;
+       unsigned long long size_bootldr;
        unsigned long long size_boot;
        unsigned long long size_swap;
        unsigned long long size_root;

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index cc886bf2d3e01d5581016d9b9fa7eded2218ea3c..7667dfefff5d19bf544853647d3ea619de3b9d36 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -410,10 +410,11 @@ int main(int argc, char *argv[]) {
        }
 
        fprintf(flog, "Destination drive: %s\n", destination->path);
-       fprintf(flog, "  boot: %s (%lluMB)\n", destination->part_boot, BYTES2MB(destination->size_boot));
-       fprintf(flog, "  swap: %s (%lluMB)\n", destination->part_swap, BYTES2MB(destination->size_swap));
-       fprintf(flog, "  root: %s (%lluMB)\n", destination->part_root, BYTES2MB(destination->size_root));
-       fprintf(flog, "  data: %s (%lluMB)\n", destination->part_data, BYTES2MB(destination->size_data));
+       fprintf(flog, "  bootldr: %s (%lluMB)\n", destination->part_bootldr, BYTES2MB(destination->size_bootldr));
+       fprintf(flog, "  boot   : %s (%lluMB)\n", destination->part_boot, BYTES2MB(destination->size_boot));
+       fprintf(flog, "  swap   : %s (%lluMB)\n", destination->part_swap, BYTES2MB(destination->size_swap));
+       fprintf(flog, "  root   : %s (%lluMB)\n", destination->part_root, BYTES2MB(destination->size_root));
+       fprintf(flog, "  data   : %s (%lluMB)\n", destination->part_data, BYTES2MB(destination->size_data));
 
        // Warn the user if there is not enough space to create a swap partition
        if (!unattended && !*destination->part_swap) {