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

Move grub_disk_write out of kernel into disk.mod.

Browse source
This commit is contained in:
Vladimir Serbinenko 2013-10-27 15:44:55 +01:00
parent 04dea7e6c2
commit 442b86de32
8 changed files with 259 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

14
grub-core/disk/cryptodisk.c
View file

@ -631,10 +631,16 @@ grub_cryptodisk_write (grub_disk_t disk, grub_disk_addr_t sector,
return grub_crypto_gcry_error (gcry_err);
}
err = grub_disk_write (dev->source_disk,
(sector << (disk->log_sector_size
- GRUB_DISK_SECTOR_BITS)) + dev->offset,
0, size << disk->log_sector_size, tmp);
/* Since ->write was called so disk.mod is loaded but be paranoid */
if (grub_disk_write_weak)
err = grub_disk_write_weak (dev->source_disk,
(sector << (disk->log_sector_size
- GRUB_DISK_SECTOR_BITS))
+ dev->offset,
0, size << disk->log_sector_size, tmp);
else
err = grub_error (GRUB_ERR_BUG, "disk.mod not loaded");
grub_free (tmp);
return err;
}