From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1JIrDO-0001fJ-Qo for mharc-grub-devel@gnu.org; Sat, 26 Jan 2008 15:01:22 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JIrDM-0001f4-MN for grub-devel@gnu.org; Sat, 26 Jan 2008 15:01:20 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JIrDK-0001eW-Az for grub-devel@gnu.org; Sat, 26 Jan 2008 15:01:19 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JIrDK-0001eT-5N for grub-devel@gnu.org; Sat, 26 Jan 2008 15:01:18 -0500 Received: from aybabtu.com ([69.60.117.155]) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1JIrDJ-0004l8-Mu for grub-devel@gnu.org; Sat, 26 Jan 2008 15:01:17 -0500 Received: from [192.168.10.6] (helo=thorin) by aybabtu.com with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.63) (envelope-from ) id 1JIrDD-00057M-Bo for grub-devel@gnu.org; Sat, 26 Jan 2008 21:01:11 +0100 Received: from rmh by thorin with local (Exim 4.63) (envelope-from ) id 1JIrBh-0001jm-5p for grub-devel@gnu.org; Sat, 26 Jan 2008 20:59:37 +0100 Date: Sat, 26 Jan 2008 20:59:37 +0100 From: Robert Millan To: The development of GRUB 2 Message-ID: <20080126195937.GC6486@thorin> References: <20080126194444.16214.26226.stgit@dv.roinet.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20080126194444.16214.26226.stgit@dv.roinet.com> Organization: free as in freedom X-Message-Flag: Worried about Outlook viruses? Switch to Thunderbird! www.mozilla.com/thunderbird X-Debbugs-No-Ack: true User-Agent: Mutt/1.5.13 (2006-08-11) X-detected-kernel: by monty-python.gnu.org: Genre and OS details not recognized. Subject: Re: [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 20:01:21 -0000 On Sat, Jan 26, 2008 at 02:44:44PM -0500, Pavel Roskin wrote: > > --- > > 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; Seems fine, but are you sure this error is handled somewhere? -- Robert Millan I know my rights; I want my phone call! What use is a phone call… if you are unable to speak? (as seen on /.)