diff --git a/ChangeLog b/ChangeLog index 92575aab7..ef4c6901a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-11-12 Vladimir Serbinenko + + * grub-core/disk/cryptodisk.c (luks_script_get): Adapt to new procfs + API. + 2013-11-12 Vladimir Serbinenko * grub-core/tests/legacy_password_test.c (vectors): Make static. diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c index a8a9b7171..9a4509bf0 100644 --- a/grub-core/disk/cryptodisk.c +++ b/grub-core/disk/cryptodisk.c @@ -1011,12 +1011,14 @@ hex (grub_uint8_t val) /* Open a file named NAME and initialize FILE. */ static char * -luks_script_get (void) +luks_script_get (grub_size_t *sz) { grub_cryptodisk_t i; grub_size_t size = 0; char *ptr, *ret; + *sz = 0; + for (i = cryptodisk_list; i != NULL; i = i->next) if (grub_strcmp (i->modname, "luks") == 0) { @@ -1098,6 +1100,7 @@ luks_script_get (void) *ptr++ = '\n'; } *ptr = '\0'; + *sz = ptr - ret; return ret; }