correct Changelog spelling

diff --git a/ChangeLog b/ChangeLog
index 1820e3306d0b24d524fe91955d199fbf5fa99e90..e8b2bf0e79e3c50e2efa1337c76cf9933ce3f805 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,7 @@
 2011-04-08  Colin Watson  <cjwatson@ubuntu.com>
 
        * autogen.sh: Ensure that collate and ctype locale is C.
-       * conf/Makefile.common: Likeiwise.
+       * conf/Makefile.common: Likewise.
 
 2011-04-08  Vladimir Serbinenko  <phcoder@gmail.com>
 

diff --git a/grub-core/loader/i386/multiboot_mbi.c b/grub-core/loader/i386/multiboot_mbi.c
index 14db50bcd23372f83280d956371d38099983466f..bef534296f28408da5b1303690c6e0258b70d717 100644 (file)
--- a/grub-core/loader/i386/multiboot_mbi.c
+++ b/grub-core/loader/i386/multiboot_mbi.c
@@ -435,7 +435,7 @@ grub_multiboot_make_mbi (grub_uint32_t *target)
   bufsize = grub_multiboot_get_mbi_size ();
 
   err = grub_relocator_alloc_chunk_align (grub_multiboot_relocator, &ch,
-                                         0, 0xffffffff - bufsize,
+                                         0x10000, 0x100000 - bufsize,
                                          bufsize, 4,
                                          GRUB_RELOCATOR_PREFERENCE_NONE);
   if (err)

diff --git a/include/grub/efiemu/efiemu.h b/include/grub/efiemu/efiemu.h
index 8eee98b61ca5eca4b27006f94a4db413c49e1f34..9cedc32264e9da2bd2cb3eb615e2e31fb41d81cf 100644 (file)
--- a/include/grub/efiemu/efiemu.h
+++ b/include/grub/efiemu/efiemu.h
@@ -21,6 +21,7 @@
 
 #include <grub/efi/api.h>
 #include <grub/file.h>
+#include <grub/memory.h>
 
 #define GRUB_EFIEMU_PAGESIZE 4096
 
@@ -227,9 +228,7 @@ grub_efiemu_finish_boot_services (grub_efi_uintn_t *memory_map_size,
                                  grub_efi_uint32_t *descriptor_version);
 
 grub_err_t
-grub_efiemu_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t,
-                                                       grub_uint64_t,
-                                                       grub_uint32_t));
+grub_efiemu_mmap_iterate (grub_memory_hook_t hook);
 int grub_efiemu_sizeof_uintn_t (void);
 grub_err_t
 grub_efiemu_get_lower_upper_memory (grub_uint64_t *lower, grub_uint64_t *upper);

diff --git a/include/grub/util/raid.h b/include/grub/util/raid.h
index 67020bb86560f38d264325bc3a7c55d0c6a4905e..4da5eaaa81a0e9130e47589bb44649115ef62fb9 100644 (file)
--- a/include/grub/util/raid.h
+++ b/include/grub/util/raid.h
@@ -21,7 +21,7 @@
 #define GRUB_RAID_UTIL_HEADER  1
 
 #ifdef __linux__
-char** grub_util_raid_getmembers (char *name);
+char** grub_util_raid_getmembers (const char *name);
 #endif
 
 #endif /* ! GRUB_RAID_UTIL_HEADER */

diff --git a/util/grub-setup.c b/util/grub-setup.c
index c1f2a1f5ee1fda7d9de65b39295e951d27c6c132..ed2d63fdd24f3eb62670290f51a34c3785a4159b 100644 (file)
--- a/util/grub-setup.c
+++ b/util/grub-setup.c
@@ -973,7 +973,15 @@ main (int argc, char *argv[])
       char **devicelist;
       int i;
 
-      devicelist = grub_util_raid_getmembers (dest_dev);
+      if (arguments.device[0] == '/')
+       devicelist = grub_util_raid_getmembers (arguments.device);
+      else
+       {
+         char *devname;
+         devname = xasprintf ("/dev/%s", dest_dev);
+         devicelist = grub_util_raid_getmembers (dest_dev);
+         free (devname);
+       }
 
       for (i = 0; devicelist[i]; i++)
         {

diff --git a/util/raid.c b/util/raid.c
index dac19a9350ea04ac7b44af204c3c28200d573dff..a6aa5f95e19dc79e4e267c3b5799d9f28d3d1830 100644 (file)
--- a/util/raid.c
+++ b/util/raid.c
@@ -36,25 +36,18 @@
 #include <linux/raid/md_u.h>
 
 char **
-grub_util_raid_getmembers (char *name)
+grub_util_raid_getmembers (const char *name)
 {
   int fd, ret, i, j;
-  char *devname;
   char **devicelist;
   mdu_version_t version;
   mdu_array_info_t info;
   mdu_disk_info_t disk;
 
-  devname = xmalloc (strlen (name) + 6);
-  strcpy (devname, "/dev/");
-  strcpy (devname+5, name);
-
-  fd = open (devname, O_RDONLY);
+  fd = open (name, O_RDONLY);
 
   if (fd == -1)
-    grub_util_error ("can't open %s: %s", devname, strerror (errno));
-
-  free (devname);
+    grub_util_error ("can't open %s: %s", name, strerror (errno));
 
   ret = ioctl (fd, RAID_VERSION, &version);
   if (ret != 0)