2009-07-31 Bean <bean123ch@gmail.com>

* disk/lvm.c (grub_lvm_scan_device): Ignore extra copy of metadata.
	Don't change pv->disk if it's already set.

	* disk/raid.c (grub_raid_scan_device): Merge this function into ...
	(grub_raid_register): ... here.
	(grub_raid_rescan): Removed.

	* include/grub/raid.h (grub_raid_rescan): Removed.

	* util/grub-fstest.c: Remove include file <grub/raid.h>.
	(fstest): Replace grub_raid_rescan with module fini function followed
	by init function.

	* util/grub-probe.c: Add include file <grub/raid.h>.
	(probe_raid_level): New function.
	(probe): Detect abstraction by walking the disk device, support two
	level of abstraction (LVM on RAID) when detecting partition map.
This commit is contained in:
bean 2009-07-31 14:25:19 +00:00
parent 24443b5a47
commit f45d6cfc48
6 changed files with 139 additions and 93 deletions

View file

@ -28,7 +28,6 @@
#include <grub/env.h>
#include <grub/term.h>
#include <grub/mm.h>
#include <grub/raid.h>
#include <grub/lib/hexdump.h>
#include <grub/lib/crc.h>
#include <grub/command.h>
@ -293,7 +292,13 @@ fstest (char **images, int num_disks, int cmd, int n, char **args)
grub_util_error ("loopback command fails.");
}
grub_raid_rescan ();
grub_lvm_fini ();
grub_mdraid_fini ();
grub_raid_fini ();
grub_raid_init ();
grub_mdraid_init ();
grub_lvm_init ();
switch (cmd)
{
case CMD_LS: