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

2010-01-24 Robert Millan <rmh.grub@aybabtu.com>

Browse source 
* loader/mips/linux.c (grub_cmd_linux, grub_cmd_initrd): Don't
	capitalize error strings.
This commit is contained in:
Robert Millan 2010-01-24 21:04:29 +00:00
parent c273d4cea9
commit 67951a534f
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2010-01-24 Robert Millan <rmh.grub@aybabtu.com>
* loader/mips/linux.c (grub_cmd_linux, grub_cmd_initrd): Don't
capitalize error strings.
2010-01-24 Samuel Thibault <samuel.thibault@ens-lyon.org> 2010-01-24 Samuel Thibault <samuel.thibault@ens-lyon.org>
* util/grub.d/10_hurd.in: Add a recovery mode. * util/grub.d/10_hurd.in: Add a recovery mode.

12
loader/mips/linux.c
View file

@ -196,7 +196,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
{ {
grub_elf_close (elf); grub_elf_close (elf);
return grub_error (GRUB_ERR_UNKNOWN_OS, return grub_error (GRUB_ERR_UNKNOWN_OS,
"This ELF file is not of the right type\n"); "this ELF file is not of the right type\n");
} }
/* Release the previously used memory. */ /* Release the previously used memory. */
@ -236,7 +236,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
if (grub_elf_is_elf64 (elf)) if (grub_elf_is_elf64 (elf))
err = grub_linux_load64 (elf, &extra, size); err = grub_linux_load64 (elf, &extra, size);
else else
err = grub_error (GRUB_ERR_BAD_FILE_TYPE, "Unknown ELF class"); err = grub_error (GRUB_ERR_BAD_FILE_TYPE, "unknown ELF class");
grub_elf_close (elf); grub_elf_close (elf);
@ -325,13 +325,13 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
grub_size_t overhead; grub_size_t overhead;
if (argc == 0) if (argc == 0)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "No initrd specified"); return grub_error (GRUB_ERR_BAD_ARGUMENT, "no initrd specified");
if (!loaded) if (!loaded)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "You need to load Linux first."); return grub_error (GRUB_ERR_BAD_ARGUMENT, "you need to load Linux first.");
if (initrd_loaded) if (initrd_loaded)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "Only one initrd can be loaded."); return grub_error (GRUB_ERR_BAD_ARGUMENT, "only one initrd can be loaded.");
file = grub_file_open (argv[0]); file = grub_file_open (argv[0]);
if (! file) if (! file)
@ -353,7 +353,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
if (grub_file_read (file, playground + linux_size + overhead, size) != size) if (grub_file_read (file, playground + linux_size + overhead, size) != size)
{ {
grub_error (GRUB_ERR_FILE_READ_ERROR, "Couldn't read file"); grub_error (GRUB_ERR_FILE_READ_ERROR, "couldn't read file");
grub_file_close (file); grub_file_close (file);
return grub_errno; return grub_errno;