Fix grub-emu build.

	* grub-core/kern/emu/main.c: Remove #include <getopt.h>.
	* grub-core/kern/emu/full.c: Split grub_mdraid_{init,fini} into
	mdraid09 and mdraid1x.

diff --git a/ChangeLog b/ChangeLog
index 95a0ae2fb3174be665895e246c0e984ea459e957..c2aa58c02180134d64bf9fbf25944b217e8d423d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-25  BVK Chaitanya  <bvk.groups@gmail.com>
+
+       Fix grub-emu build.
+
+       * grub-core/kern/emu/main.c: Remove #include <getopt.h>.
+       * grub-core/kern/emu/full.c: Split grub_mdraid_{init,fini} into
+       mdraid09 and mdraid1x.
+
 2010-09-24  Colin Watson  <cjwatson@ubuntu.com>
 
        Re-enable grub-extras.

diff --git a/grub-core/kern/emu/full.c b/grub-core/kern/emu/full.c
index a5801db2f4bd7e8ab2dfea60f0872ad120d90bcb..422ca6ec60d7b5636f3ca5c3f3f838db8834cdc1 100644 (file)
--- a/grub-core/kern/emu/full.c
+++ b/grub-core/kern/emu/full.c
@@ -61,9 +61,11 @@ void
 grub_emu_post_init (void)
 {
   grub_lvm_fini ();
-  grub_mdraid_fini ();
+  grub_mdraid09_fini ();
+  grub_mdraid1x_fini ();
   grub_raid_fini ();
   grub_raid_init ();
-  grub_mdraid_init ();
+  grub_mdraid09_fini ();
+  grub_mdraid1x_fini ();
   grub_lvm_init ();
 }

diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
index c575beb4bc0eac3fc833cb307573021c6e04fcee..0a7645992b10512afcea369ba9a91cb8eba26afc 100644 (file)
--- a/grub-core/kern/emu/main.c
+++ b/grub-core/kern/emu/main.c
@@ -21,7 +21,6 @@
 #include <stdlib.h>
 #include <setjmp.h>
 #include <sys/stat.h>
-#include <getopt.h>
 #include <string.h>
 #include <signal.h>
 #include <sys/types.h>