From: robertmh <robertmh@localhost>
Date: Sat, 27 Jun 2009 12:21:18 +0000 (+0000)
Subject: 2009-06-27  Robert Millan  <rmh.grub@aybabtu.com>
X-Git-Tag: 1.98~755
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=87a4623bda50569041bd4ad2e47f1759128525bd;p=thirdparty%2Fgrub.git

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 5bd20acd2..53774cdb5 100644
--- 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 86f584c57..6510db670 100644
--- 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 97df54dee..c5279f6ce 100644
--- 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)
     {