From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1JIqxO-0004mI-2r for mharc-grub-devel@gnu.org; Sat, 26 Jan 2008 14:44:50 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JIqxM-0004m3-46 for grub-devel@gnu.org; Sat, 26 Jan 2008 14:44:48 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JIqxK-0004lr-Sx for grub-devel@gnu.org; Sat, 26 Jan 2008 14:44:47 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JIqxK-0004lo-P8 for grub-devel@gnu.org; Sat, 26 Jan 2008 14:44:46 -0500 Received: from c60.cesmail.net ([216.154.195.49]) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.60) (envelope-from ) id 1JIqxK-0000wf-F1 for grub-devel@gnu.org; Sat, 26 Jan 2008 14:44:46 -0500 Received: from unknown (HELO relay.cesmail.net) ([192.168.1.81]) by c60.cesmail.net with ESMTP; 26 Jan 2008 14:44:45 -0500 Received: from dv.roinet.com (static-72-92-88-10.phlapa.fios.verizon.net [72.92.88.10]) by relay.cesmail.net (Postfix) with ESMTP id 56255618FE1 for ; Sat, 26 Jan 2008 14:44:45 -0500 (EST) From: Pavel Roskin To: grub-devel@gnu.org Date: Sat, 26 Jan 2008 14:44:44 -0500 Message-ID: <20080126194444.16214.26226.stgit@dv.roinet.com> User-Agent: StGIT/0.14.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-detected-kernel: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [PATCH] Don't abort if prefix is not set X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Jan 2008 19:44:48 -0000 --- ChangeLog | 5 +++++ kern/dl.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 009b4dc..44d5887 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-01-26 Pavel Roskin + + * kern/dl.c (grub_dl_load): Don't abort if prefix is not set, + just return an error. + 2008-01-26 Bean * fs/reiserfs.c (grub_fshelp_node): New member next_offset. diff --git a/kern/dl.c b/kern/dl.c index d3488fb..9e8c24a 100644 --- a/kern/dl.c +++ b/kern/dl.c @@ -625,8 +625,10 @@ grub_dl_load (const char *name) if (mod) return mod; - if (! grub_dl_dir) - grub_fatal ("module dir is not initialized yet"); + if (! grub_dl_dir) { + grub_error (GRUB_ERR_FILE_NOT_FOUND, "\"prefix\" is not set"); + return 0; + } filename = (char *) grub_malloc (grub_strlen (grub_dl_dir) + 1 + grub_strlen (name) + 4 + 1);