* grub-core/kern/emu/main.c (main): Reinit LVM and RAID.

	* util/grub-probe.c (main): Likewise.
	* util/i386/pc/grub-setup.c (main): Likewise.
	* util/sparc64/ieee1275/grub-setup.c (main): Likewise.
	Reported and debugged by: alexxy

diff --git a/ChangeLog b/ChangeLog
index 0f4c54c14322e1f5091f712d800e745c271e5640..03114c54e7de14097380a56c8c9864f96ee3f394 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-05  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/kern/emu/main.c (main): Reinit LVM and RAID.
+       * util/grub-probe.c (main): Likewise.
+       * util/i386/pc/grub-setup.c (main): Likewise.
+       * util/sparc64/ieee1275/grub-setup.c (main): Likewise.
+       Reported and debugged by: alexxy
+
 2010-09-05  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/disk/lvm.c (grub_lvm_scan_device) [GRUB_UTIL]: Output more

diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
index 9156aa8905aa4ebecaafa96a534b8bafc6d84232..8867f6101ddf6ce23b9269e5fa16667b5635ff9c 100644 (file)
--- a/grub-core/kern/emu/main.c
+++ b/grub-core/kern/emu/main.c
@@ -197,6 +197,13 @@ main (int argc, char *argv[])
 
   grub_init_all ();
 
+  grub_lvm_fini ();
+  grub_mdraid_fini ();
+  grub_raid_fini ();
+  grub_raid_init ();
+  grub_mdraid_init ();
+  grub_lvm_init ();
+
   /* Make sure that there is a root device.  */
   if (! root_dev)
     {

diff --git a/util/grub-probe.c b/util/grub-probe.c
index 62206bf0e0b8af76c424f1749039e6f27bf069f6..f02d985897f2fd9eb77bb1a0dc9f52ff3815bf02 100644 (file)
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@@ -422,6 +422,13 @@ main (int argc, char *argv[])
   /* Initialize all modules. */
   grub_init_all ();
 
+  grub_lvm_fini ();
+  grub_mdraid_fini ();
+  grub_raid_fini ();
+  grub_raid_init ();
+  grub_mdraid_init ();
+  grub_lvm_init ();
+
   /* Do it.  */
   if (argument_is_device)
     probe (NULL, argument);

diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index 642d9d104f526f52e48ca3231d5b7fad17a08312..ff5aeda4008bf267c0f30ed69b628a4ad8e00697 100644 (file)
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -751,6 +751,13 @@ main (int argc, char *argv[])
   /* Initialize all modules. */
   grub_init_all ();
 
+  grub_lvm_fini ();
+  grub_mdraid_fini ();
+  grub_raid_fini ();
+  grub_raid_init ();
+  grub_mdraid_init ();
+  grub_lvm_init ();
+
   dest_dev = get_device_name (argv[optind]);
   if (! dest_dev)
     {

diff --git a/util/sparc64/ieee1275/grub-setup.c b/util/sparc64/ieee1275/grub-setup.c
index d8481295f1f32ab47f3a9d13ea6fb61e3ac80069..1b1a809118c94f41bc1553807a3455fa67769c15 100644 (file)
--- a/util/sparc64/ieee1275/grub-setup.c
+++ b/util/sparc64/ieee1275/grub-setup.c
@@ -614,6 +614,13 @@ main (int argc, char *argv[])
   /* Initialize all modules. */
   grub_init_all ();
 
+  grub_lvm_fini ();
+  grub_mdraid_fini ();
+  grub_raid_fini ();
+  grub_raid_init ();
+  grub_mdraid_init ();
+  grub_lvm_init ();
+
   find_dest_dev (&ginfo, argv);
 
   ginfo.prefix = grub_make_system_path_relative_to_its_root (ginfo.dir ?