webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

installer: Mark the GRUB boot partition as bootable on GPT.

Browse Source
This commit is contained in:
Michael Tremer
2014-08-12 15:17:29 +02:00
parent eb3ff46eaa
commit e9cf574d50
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/installer/hw.c
View File

@@ -587,17 +587,17 @@ int hw_create_partitions(struct hw_destination* dest) {
part_start += dest->size_data; part_start += dest->size_data;
} }
if (dest->part_table == HW_PART_TABLE_MSDOS && dest->part_boot_idx > 0) { if (dest->part_boot_idx > 0)
asprintf(&cmd, "%s set %d boot on", cmd, dest->part_boot_idx); asprintf(&cmd, "%s set %d boot on", cmd, dest->part_boot_idx);
} else if (dest->part_table == HW_PART_TABLE_GPT) { if (dest->part_table == HW_PART_TABLE_GPT) {
if (*dest->part_bootldr) { if (*dest->part_bootldr) {
asprintf(&cmd, "%s set %d bios_grub on", cmd, dest->part_boot_idx); asprintf(&cmd, "%s set %d bios_grub on", cmd, dest->part_boot_idx);
} }
asprintf(&cmd, "%s disk_set pmbr_boot on", cmd); asprintf(&cmd, "%s disk_set pmbr_boot on", cmd);
} }
int r = mysystem(cmd); r = mysystem(cmd);
// Wait until the system re-read the partition table // Wait until the system re-read the partition table
if (r == 0) { if (r == 0) {
@@ -885,7 +885,7 @@ int hw_install_bootloader(struct hw_destination* dest) {
char cmd_grub[STRING_SIZE]; char cmd_grub[STRING_SIZE];
snprintf(cmd_grub, sizeof(cmd_grub), "/usr/sbin/grub-install --no-floppy --recheck"); snprintf(cmd_grub, sizeof(cmd_grub), "/usr/sbin/grub-install --no-floppy --recheck");
if (dest->is_raid && (dest->part_table == HW_PART_TABLE_MSDOS)) { if (dest->is_raid) {
snprintf(cmd, sizeof(cmd), "%s %s", cmd_grub, dest->disk1->path); snprintf(cmd, sizeof(cmd), "%s %s", cmd_grub, dest->disk1->path);
r = system_chroot(DESTINATION_MOUNT_PATH, cmd); r = system_chroot(DESTINATION_MOUNT_PATH, cmd);
if (r) if (r)