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

merge lazy into luks

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-04-22 15:13:12 +02:00
commit 0aaa85f1a0
23 changed files with 542 additions and 193 deletions
Download patch file Download diff file Expand all files Collapse all files

9
grub-core/disk/luks.c
View file

@ -498,10 +498,14 @@ grub_luks_scan_device (const char *name)
}
static int
grub_luks_iterate (int (*hook) (const char *name))
grub_luks_iterate (int (*hook) (const char *name),
grub_disk_pull_t pull)
{
grub_luks_t i;
if (pull != GRUB_DISK_PULL_NONE)
return 0;
for (i = luks_list; i != NULL; i = i->next)
{
char buf[30];
@ -514,7 +518,8 @@ grub_luks_iterate (int (*hook) (const char *name))
}
static grub_err_t
grub_luks_open (const char *name, grub_disk_t disk)
grub_luks_open (const char *name, grub_disk_t disk,
grub_disk_pull_t pull __attribute__ ((unused)))
{
grub_luks_t dev;