[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] Don't abort if prefix is not set
From: |
Robert Millan |
Subject: |
Re: [PATCH] Don't abort if prefix is not set |
Date: |
Sat, 26 Jan 2008 20:59:37 +0100 |
User-agent: |
Mutt/1.5.13 (2006-08-11) |
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 <address@hidden>
> +
> + * kern/dl.c (grub_dl_load): Don't abort if prefix is not set,
> + just return an error.
> +
> 2008-01-26 Bean <address@hidden>
>
> * 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
<GPLv2> I know my rights; I want my phone call!
<DRM> What use is a phone call… if you are unable to speak?
(as seen on /.)