From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1JAS5r-000448-Jm for mharc-grub-devel@gnu.org; Thu, 03 Jan 2008 10:34:51 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JAS5q-00043j-1k for grub-devel@gnu.org; Thu, 03 Jan 2008 10:34:50 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JAS5p-00043N-C8 for grub-devel@gnu.org; Thu, 03 Jan 2008 10:34:49 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JAS5p-00043K-6n for grub-devel@gnu.org; Thu, 03 Jan 2008 10:34:49 -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 1JAS5o-0005Q7-KY for grub-devel@gnu.org; Thu, 03 Jan 2008 10:34:48 -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 1JAS5J-00074m-SS for grub-devel@gnu.org; Thu, 03 Jan 2008 16:34:20 +0100 Received: from rmh by thorin with local (Exim 4.63) (envelope-from ) id 1JAS2P-0006U6-GU for grub-devel@gnu.org; Thu, 03 Jan 2008 16:31:17 +0100 Date: Thu, 3 Jan 2008 16:31:17 +0100 From: Robert Millan To: grub-devel@gnu.org Message-ID: <20080103153117.GA24882@thorin> References: <20080103150311.GA20790@thorin> <20080103150558.GA21928@thorin> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="17pEHd4RhPHOinZp" Content-Disposition: inline In-Reply-To: <20080103150558.GA21928@thorin> 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: variable hooks & global variables 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: Thu, 03 Jan 2008 15:34:50 -0000 --17pEHd4RhPHOinZp Content-Type: text/plain; charset=us-ascii Content-Disposition: inline I propose this patch to preserve hooks only when variables are already marked as global. Additionally, it exports "root" variable. On Thu, Jan 03, 2008 at 04:05:58PM +0100, Robert Millan wrote: > On Thu, Jan 03, 2008 at 04:03:11PM +0100, Robert Millan wrote: > > > > When you set a variable hook (grub_register_variable_hook), this hook isn't > > preserved after someone (e.g. configfile command) opens a new context > > (grub_env_context_open), unless the variable has been set as global > > (grub_env_export). > > > > Is this what we want? > > > > The only current user of variable hooks is "root" variable, and that hook > > contains a sanity check that seems to be more suitable for global scope. > > > > The color-related variables for which I wanted to add hooks would also > > like to keep their hooks across contexts. > > > > One option is to export these variables, or to modify grub_env_context_open() > > to preserve hooks as well as exported variables. I'm more inclined for the > > latter. > > > > Comments? > > Erm, ignore the part about global variables. Exporting them doesn't help: > > for (var = context->prev->vars[i]; var; var = var->next) > { > if (var->type == GRUB_ENV_VAR_GLOBAL) > if (grub_env_set (var->name, var->value) != GRUB_ERR_NONE) > { > grub_env_context_close (); > return grub_errno; > } > } > > So, we just preserve hooks ? > > -- > 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 /.) -- 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 /.) --17pEHd4RhPHOinZp Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="context.diff" * kern/env.c (grub_env_context_open): Propagate hooks for global variables to new context. * kern/main.c (grub_set_root_dev): Export `root' variable. diff -x '*~' -x '*.mk' -Nurp grub2/kern/env.c grub2.color/kern/env.c --- grub2/kern/env.c 2007-12-30 09:52:04.000000000 +0100 +++ grub2.color/kern/env.c 2008-01-03 16:13:20.000000000 +0100 @@ -1,7 +1,7 @@ /* env.c - Environment variables */ /* * GRUB -- GRand Unified Bootloader - * Copyright (C) 2003,2005,2006,2007 Free Software Foundation, Inc. + * Copyright (C) 2003,2005,2006,2007,2008 Free Software Foundation, Inc. * * GRUB is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -96,11 +96,14 @@ grub_env_context_open (void) for (var = context->prev->vars[i]; var; var = var->next) { if (var->type == GRUB_ENV_VAR_GLOBAL) - if (grub_env_set (var->name, var->value) != GRUB_ERR_NONE) - { - grub_env_context_close (); - return grub_errno; - } + { + if (grub_env_set (var->name, var->value) != GRUB_ERR_NONE) + { + grub_env_context_close (); + return grub_errno; + } + grub_register_variable_hook (var->name, var->read_hook, var->write_hook); + } } } diff -x '*~' -x '*.mk' -Nurp grub2/kern/main.c grub2.color/kern/main.c --- grub2/kern/main.c 2007-07-22 01:32:26.000000000 +0200 +++ grub2.color/kern/main.c 2008-01-03 16:29:19.000000000 +0100 @@ -1,7 +1,7 @@ /* main.c - the kernel main routine */ /* * GRUB -- GRand Unified Bootloader - * Copyright (C) 2002,2003,2005 Free Software Foundation, Inc. + * Copyright (C) 2002,2003,2005,2006,2008 Free Software Foundation, Inc. * * GRUB is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -78,6 +78,7 @@ grub_set_root_dev (void) const char *prefix; grub_register_variable_hook ("root", 0, grub_env_write_root); + grub_env_export ("root"); prefix = grub_env_get ("prefix"); --17pEHd4RhPHOinZp--