From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1MXEp0-0007gp-1m for mharc-grub-devel@gnu.org; Sat, 01 Aug 2009 09:40:26 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MXEoy-0007gg-P3 for grub-devel@gnu.org; Sat, 01 Aug 2009 09:40:24 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MXEou-0007gU-9a for grub-devel@gnu.org; Sat, 01 Aug 2009 09:40:24 -0400 Received: from [199.232.76.173] (port=54490 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXEou-0007gR-5i for grub-devel@gnu.org; Sat, 01 Aug 2009 09:40:20 -0400 Received: from xvm-190-8.ghst.net ([217.70.190.8]:33650 helo=aybabtu.com) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MXEot-0003Xm-OK for grub-devel@gnu.org; Sat, 01 Aug 2009 09:40:19 -0400 Received: from [192.168.10.10] (helo=thorin) by aybabtu.com with esmtp (Exim 4.69) (envelope-from ) id 1MXEop-0001Bl-L8 for grub-devel@gnu.org; Sat, 01 Aug 2009 13:40:15 +0000 Received: from rmh by thorin with local (Exim 4.69) (envelope-from ) id 1MXEoo-0005s4-JQ for grub-devel@gnu.org; Sat, 01 Aug 2009 15:40:14 +0200 Date: Sat, 1 Aug 2009 15:40:14 +0200 From: Robert Millan To: grub-devel@gnu.org Message-ID: <20090801134014.GA22565@thorin> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="wac7ysb48OaltWcw" Content-Disposition: inline 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.18 (2008-05-17) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: [PATCH] fix usability problem in FreeBSD loader 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, 01 Aug 2009 13:40:24 -0000 --wac7ysb48OaltWcw Content-Type: text/plain; charset=us-ascii Content-Disposition: inline There's a minor usability problem with FreeBSD loader. E.g. if user runs freebsd_module first, the error message is confusing. -- Robert Millan The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and how) you may access your data; but nobody's threatening your freedom: we still allow you to remove your data and not access it at all." --wac7ysb48OaltWcw Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="freebsd.diff" 2009-08-01 Robert Millan * loader/i386/bsd.c (grub_cmd_freebsd_loadenv, grub_cmd_freebsd_module) (grub_cmd_freebsd_module_elf): Abort with "You need to load the kernel first." when `kernel_type' is set to KERNEL_TYPE_NONE. Index: loader/i386/bsd.c =================================================================== --- loader/i386/bsd.c (revision 2461) +++ loader/i386/bsd.c (working copy) @@ -47,7 +47,7 @@ #define MOD_BUF_ALLOC_UNIT 4096 -static int kernel_type; +static int kernel_type; /* 0 == KERNEL_TYPE_NONE */ static grub_dl_t my_mod; static grub_addr_t entry, entry_hi, kern_start, kern_end; static grub_uint32_t bootflags; @@ -914,6 +914,10 @@ grub_cmd_freebsd_loadenv (grub_command_t char *buf = 0, *curr, *next; int len; + if (kernel_type == KERNEL_TYPE_NONE) + return grub_error (GRUB_ERR_BAD_ARGUMENT, + "You need to load the kernel first."); + if (kernel_type != KERNEL_TYPE_FREEBSD) return grub_error (GRUB_ERR_BAD_ARGUMENT, "only freebsd support environment"); @@ -1004,6 +1008,10 @@ grub_cmd_freebsd_module (grub_command_t char **modargv; char *type; + if (kernel_type == KERNEL_TYPE_NONE) + return grub_error (GRUB_ERR_BAD_ARGUMENT, + "You need to load the kernel first."); + if (kernel_type != KERNEL_TYPE_FREEBSD) return grub_error (GRUB_ERR_BAD_ARGUMENT, "only freebsd support module"); @@ -1066,6 +1074,10 @@ grub_cmd_freebsd_module_elf (grub_comman grub_file_t file = 0; grub_err_t err; + if (kernel_type == KERNEL_TYPE_NONE) + return grub_error (GRUB_ERR_BAD_ARGUMENT, + "You need to load the kernel first."); + if (kernel_type != KERNEL_TYPE_FREEBSD) return grub_error (GRUB_ERR_BAD_ARGUMENT, "only freebsd support module"); --wac7ysb48OaltWcw--