merge mainline into yeeloongfw
This commit is contained in:
commit
e34b610d49
231 changed files with 20569 additions and 15101 deletions
|
@ -24,6 +24,10 @@
|
|||
#include <grub/misc.h>
|
||||
#include <grub/lvm.h>
|
||||
|
||||
#ifdef GRUB_UTIL
|
||||
#include <grub/emu/misc.h>
|
||||
#endif
|
||||
|
||||
static struct grub_lvm_vg *vg_list;
|
||||
static int lv_count;
|
||||
|
||||
|
@ -68,6 +72,9 @@ grub_lvm_memberlist (grub_disk_t disk)
|
|||
if (lv->vg->pvs)
|
||||
for (pv = lv->vg->pvs; pv; pv = pv->next)
|
||||
{
|
||||
if (!pv->disk)
|
||||
grub_util_error ("Couldn't find PV %s. Check your device.map",
|
||||
pv->name);
|
||||
tmp = grub_malloc (sizeof (*tmp));
|
||||
tmp->disk = pv->disk;
|
||||
tmp->next = list;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue