vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

correct Changelog spelling

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-04-08 13:59:07 +02:00
parent 18dd6b472d
commit 4ed4ce5820
6 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -2,7 +2,7 @@
2011-04-08 Colin Watson <cjwatson@ubuntu.com> 2011-04-08 Colin Watson <cjwatson@ubuntu.com>
* autogen.sh: Ensure that collate and ctype locale is C. * 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> 2011-04-08 Vladimir Serbinenko <phcoder@gmail.com>

2
grub-core/loader/i386/multiboot_mbi.c
View file

@ -435,7 +435,7 @@ grub_multiboot_make_mbi (grub_uint32_t *target)
bufsize = grub_multiboot_get_mbi_size (); bufsize = grub_multiboot_get_mbi_size ();
err = grub_relocator_alloc_chunk_align (grub_multiboot_relocator, &ch, err = grub_relocator_alloc_chunk_align (grub_multiboot_relocator, &ch,
0, 0xffffffff - bufsize, 0x10000, 0x100000 - bufsize,
bufsize, 4, bufsize, 4,
GRUB_RELOCATOR_PREFERENCE_NONE); GRUB_RELOCATOR_PREFERENCE_NONE);
if (err) if (err)

5
include/grub/efiemu/efiemu.h
View file

@ -21,6 +21,7 @@
#include <grub/efi/api.h> #include <grub/efi/api.h>
#include <grub/file.h> #include <grub/file.h>
#include <grub/memory.h>
#define GRUB_EFIEMU_PAGESIZE 4096 #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_efi_uint32_t *descriptor_version);
grub_err_t grub_err_t
grub_efiemu_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_efiemu_mmap_iterate (grub_memory_hook_t hook);
grub_uint64_t,
grub_uint32_t));
int grub_efiemu_sizeof_uintn_t (void); int grub_efiemu_sizeof_uintn_t (void);
grub_err_t grub_err_t
grub_efiemu_get_lower_upper_memory (grub_uint64_t *lower, grub_uint64_t *upper); grub_efiemu_get_lower_upper_memory (grub_uint64_t *lower, grub_uint64_t *upper);

2
include/grub/util/raid.h
View file

@ -21,7 +21,7 @@
#define GRUB_RAID_UTIL_HEADER 1 #define GRUB_RAID_UTIL_HEADER 1
#ifdef __linux__ #ifdef __linux__
char** grub_util_raid_getmembers (char *name); char** grub_util_raid_getmembers (const char *name);
#endif #endif
#endif /* ! GRUB_RAID_UTIL_HEADER */ #endif /* ! GRUB_RAID_UTIL_HEADER */

10
util/grub-setup.c
View file

@ -973,7 +973,15 @@ main (int argc, char *argv[])
char **devicelist; char **devicelist;
int i; 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++) for (i = 0; devicelist[i]; i++)
{ {

13
util/raid.c
View file

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