vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix indentation for previous commit

Browse source
This commit is contained in:
robertmh 2009-05-13 21:01:26 +00:00
parent 15fbf4c442
commit 667712d716
1 changed files with 50 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
util/i386/pc/grub-setup.c
View file

@ -311,30 +311,30 @@ setup (const char *dir,
if (! dest_dev->disk->has_partitions) if (! dest_dev->disk->has_partitions)
{ {
grub_util_warn ("Attempting to install GRUB to a partitionless disk. This is a BAD idea."); grub_util_warn ("Attempting to install GRUB to a partitionless disk. This is a BAD idea.");
goto unable_to_embed; goto unable_to_embed;
} }
if (dest_dev->disk->partition) if (dest_dev->disk->partition)
{ {
grub_util_warn ("Attempting to install GRUB to a partition instead of the MBR. This is a BAD idea."); grub_util_warn ("Attempting to install GRUB to a partition instead of the MBR. This is a BAD idea.");
goto unable_to_embed; goto unable_to_embed;
} }
/* Unlike root_dev, with dest_dev we're interested in the partition map even /* Unlike root_dev, with dest_dev we're interested in the partition map even
if dest_dev itself is a whole disk. */ if dest_dev itself is a whole disk. */
auto int NESTED_FUNC_ATTR identify_partmap (grub_disk_t disk, auto int NESTED_FUNC_ATTR identify_partmap (grub_disk_t disk,
const grub_partition_t p); const grub_partition_t p);
int NESTED_FUNC_ATTR identify_partmap (grub_disk_t disk __attribute__ ((unused)), int NESTED_FUNC_ATTR identify_partmap (grub_disk_t disk __attribute__ ((unused)),
const grub_partition_t p) const grub_partition_t p)
{ {
dest_partmap = p->partmap->name; dest_partmap = p->partmap->name;
return 1; return 1;
} }
grub_partition_iterate (dest_dev->disk, identify_partmap); grub_partition_iterate (dest_dev->disk, identify_partmap);
grub_partition_iterate (dest_dev->disk, (strcmp (dest_partmap, "pc_partition_map") ? grub_partition_iterate (dest_dev->disk, (strcmp (dest_partmap, "pc_partition_map") ?
find_usable_region_gpt : find_usable_region_msdos)); find_usable_region_gpt : find_usable_region_msdos));
if (embed_region.end == embed_region.start) if (embed_region.end == embed_region.start)
{ {
grub_util_warn ("Embedding area is not present at all!"); grub_util_warn ("Embedding area is not present at all!");
@ -348,40 +348,40 @@ setup (const char *dir,
} }
grub_util_info ("will embed the core image at sector 0x%llx", embed_region.start); grub_util_info ("will embed the core image at sector 0x%llx", embed_region.start);
*install_dos_part = grub_cpu_to_le32 (dos_part); *install_dos_part = grub_cpu_to_le32 (dos_part);
*install_bsd_part = grub_cpu_to_le32 (bsd_part); *install_bsd_part = grub_cpu_to_le32 (bsd_part);
/* The first blocklist contains the whole sectors. */ /* The first blocklist contains the whole sectors. */
first_block->start = grub_cpu_to_le64 (embed_region.start + 1); first_block->start = grub_cpu_to_le64 (embed_region.start + 1);
first_block->len = grub_cpu_to_le16 (core_sectors - 1); first_block->len = grub_cpu_to_le16 (core_sectors - 1);
first_block->segment first_block->segment
= grub_cpu_to_le16 (GRUB_BOOT_MACHINE_KERNEL_SEG = grub_cpu_to_le16 (GRUB_BOOT_MACHINE_KERNEL_SEG
+ (GRUB_DISK_SECTOR_SIZE >> 4)); + (GRUB_DISK_SECTOR_SIZE >> 4));
/* Make sure that the second blocklist is a terminator. */ /* Make sure that the second blocklist is a terminator. */
block = first_block - 1; block = first_block - 1;
block->start = 0; block->start = 0;
block->len = 0; block->len = 0;
block->segment = 0; block->segment = 0;
/* Write the core image onto the disk. */ /* Write the core image onto the disk. */
if (grub_disk_write (dest_dev->disk, embed_region.start, 0, core_size, core_img)) if (grub_disk_write (dest_dev->disk, embed_region.start, 0, core_size, core_img))
grub_util_error ("%s", grub_errmsg); grub_util_error ("%s", grub_errmsg);
/* FIXME: can this be skipped? */ /* FIXME: can this be skipped? */
*boot_drive = 0xFF; *boot_drive = 0xFF;
*root_drive = 0xFF; *root_drive = 0xFF;
*kernel_sector = grub_cpu_to_le64 (embed_region.start); *kernel_sector = grub_cpu_to_le64 (embed_region.start);
/* Write the boot image onto the disk. */ /* Write the boot image onto the disk. */
if (grub_disk_write (dest_dev->disk, 0, 0, GRUB_DISK_SECTOR_SIZE, if (grub_disk_write (dest_dev->disk, 0, 0, GRUB_DISK_SECTOR_SIZE,
boot_img)) boot_img))
grub_util_error ("%s", grub_errmsg); grub_util_error ("%s", grub_errmsg);
goto finish; goto finish;
unable_to_embed: unable_to_embed: