Fix partmap, cryptodisk, and abstraction handling in grub-mkconfig.
authorColin Watson <cjwatson@ubuntu.com>
Mon, 31 Mar 2014 13:48:33 +0000 (14:48 +0100)
committerColin Watson <cjwatson@ubuntu.com>
Mon, 31 Mar 2014 13:48:46 +0000 (14:48 +0100)
commit24024dac7f51d3c0df8e1bec63c02d52828de534
tree30181708fecb1fb2cb5fd28170d1b2332b6bcb61
parent9b35fe819f642f9277534d97f73024eb6734057d
Fix partmap, cryptodisk, and abstraction handling in grub-mkconfig.

Commit 588744d0dc655177d5883bdcb8f72ff5160109ed caused grub-mkconfig
no longer to be forgiving of trailing spaces on grub-probe output
lines, which among other things means that util/grub.d/10_linux.in
no longer detects LVM.  To fix this, make grub-probe's output
delimiting more consistent.  As a bonus, this improves the coverage
of the -0 option.

Fixes Debian bug #735935.

* grub-core/disk/cryptodisk.c
(grub_util_cryptodisk_get_abstraction): Add a user-data argument.
* grub-core/disk/diskfilter.c (grub_diskfilter_get_partmap):
Likewise.
* include/grub/cryptodisk.h (grub_util_cryptodisk_get_abstraction):
Update prototype.
* include/grub/diskfilter.h (grub_diskfilter_get_partmap): Likewise.
* util/grub-install.c (push_partmap_module, push_cryptodisk_module,
probe_mods): Adjust for extra user-data arguments.
* util/grub-probe.c (do_print, probe_partmap, probe_cryptodisk_uuid,
probe_abstraction): Use configured delimiter.  Update callers.
ChangeLog
grub-core/disk/cryptodisk.c
grub-core/disk/diskfilter.c
include/grub/cryptodisk.h
include/grub/diskfilter.h
util/grub-install.c
util/grub-probe.c