[2368] 2009-06-27 Robert Millan <[email protected]>

Robert Millan <[email protected]> Sat, 27 Jun 2009 12:21:19 +0000
Newsgroups gmane.comp.boot-loaders.grub.cvs
Message-ID <[email protected]>
Revision: 2368
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2368
Author:   robertmh
Date:     2009-06-27 12:21:18 +0000 (Sat, 27 Jun 2009)
Log Message:
-----------
2009-06-27  Robert Millan  <[email protected]>

        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.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/loader/i386/linux.c
    trunk/grub2/loader/i386/pc/linux.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog	2009-06-27 11:18:10 UTC (rev 2367)
+++ trunk/grub2/ChangeLog	2009-06-27 12:21:18 UTC (rev 2368)
@@ -1,3 +1,12 @@
+2009-06-27  Robert Millan  <[email protected]>
+
+	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  <[email protected]>
 2009-06-27  Robert Millan  <[email protected]>
 

Modified: trunk/grub2/loader/i386/linux.c
===================================================================
--- trunk/grub2/loader/i386/linux.c	2009-06-27 11:18:10 UTC (rev 2367)
+++ trunk/grub2/loader/i386/linux.c	2009-06-27 12:21:18 UTC (rev 2368)
@@ -600,10 +600,7 @@
 
   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))
     {

Modified: trunk/grub2/loader/i386/pc/linux.c
===================================================================
--- trunk/grub2/loader/i386/pc/linux.c	2009-06-27 11:18:10 UTC (rev 2367)
+++ trunk/grub2/loader/i386/pc/linux.c	2009-06-27 12:21:18 UTC (rev 2368)
@@ -69,10 +69,7 @@
 
   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)
     {