2009-06-27 Robert Millan <rmh.grub@aybabtu.com>

        Revert r2338.

        * loader/i386/linux.c (grub_cmd_linux): Don't call grub_error when
        file can't be opened.  grub_file_open() is already supposed to set
        grub_errno / grub_errmsg appropiately.
        * loader/i386/pc/linux.c (grub_cmd_linux): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 5bd20acd2faa6d6e02ecb74f6c6f126908263118..53774cdb53be0fdb6533cdc28d25a4918070796f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-06-27  Robert Millan  <rmh.grub@aybabtu.com>
+
+       Revert r2338.
+
+       * loader/i386/linux.c (grub_cmd_linux): Don't call grub_error when
+       file can't be opened.  grub_file_open() is already supposed to set
+       grub_errno / grub_errmsg appropiately.
+       * loader/i386/pc/linux.c (grub_cmd_linux): Likewise.
+
 2009-06-27  Pavel Roskin  <proski@gnu.org>
 2009-06-27  Robert Millan  <rmh.grub@aybabtu.com>
 

diff --git a/loader/i386/linux.c b/loader/i386/linux.c
index 86f584c5735746fd55511207f261152a05e5375a..6510db670e87aefa4af9ee09a03c8c6b65487821 100644 (file)
--- a/loader/i386/linux.c
+++ b/loader/i386/linux.c
@@ -600,10 +600,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
 
   file = grub_file_open (argv[0]);
   if (! file)
-    {
-      grub_error (GRUB_ERR_FILE_NOT_FOUND, "file not found");
-      goto fail;
-    }
+    goto fail;
 
   if (grub_file_read (file, &lh, sizeof (lh)) != sizeof (lh))
     {

diff --git a/loader/i386/pc/linux.c b/loader/i386/pc/linux.c
index 97df54dee68089b4c5d83614929149855cd88cbc..c5279f6ceeab6c296468e214fae29d63ed8acc9b 100644 (file)
--- a/loader/i386/pc/linux.c
+++ b/loader/i386/pc/linux.c
@@ -69,10 +69,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
 
   file = grub_file_open (argv[0]);
   if (! file)
-    {
-      grub_error (GRUB_ERR_FILE_NOT_FOUND, "file not found");
-      goto fail;
-    }
+    goto fail;
 
   if ((grub_size_t) grub_file_size (file) > grub_os_area_size)
     {