Received: from list by lists.gnu.org with archive (Exim 4.71) id 1gjq1j-0005QE-Oj for mharc-grub-devel@gnu.org; Wed, 16 Jan 2019 13:34:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50341) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjq1h-0005Ni-Gr for grub-devel@gnu.org; Wed, 16 Jan 2019 13:34:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gjq1g-0001jA-Ds for grub-devel@gnu.org; Wed, 16 Jan 2019 13:34:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53392) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gjq1g-0001iT-5r for grub-devel@gnu.org; Wed, 16 Jan 2019 13:34:56 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 68DF0811D9 for ; Wed, 16 Jan 2019 18:34:55 +0000 (UTC) Received: from prarit.bos.redhat.com (prarit-guest.khw1.lab.eng.bos.redhat.com [10.16.200.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id AC3C617DCB; Wed, 16 Jan 2019 18:34:54 +0000 (UTC) From: Prarit Bhargava To: grub-devel@gnu.org Cc: Prarit Bhargava , mleitner@redhat.com, pjones@redhat.com, javierm@redhat.com, aruiz@redhat.com Subject: [PATCH v2 3/3] grub: add extend variable functionality Date: Wed, 16 Jan 2019 13:34:43 -0500 Message-Id: <20190116183443.14978-4-prarit@redhat.com> In-Reply-To: <20190116183443.14978-1-prarit@redhat.com> References: <20190116183443.14978-1-prarit@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 16 Jan 2019 18:34:55 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2019 18:34:58 -0000 Customers and users of the kernel are commenting that there is no way to update a grub variable without copy and pasting the existing data. For example, [10:57 AM root@intel-wildcatpass-07 grub-2.02]# ./grub-editenv list saved_entry=0 next_entry= kernelopts=root=/dev/mapper/rhel_intel--wildcatpass--07-root ro crashkernel=auto resume=/dev/mapper/rhel_intel--wildcatpass--07-swap rd.lvm.lv=rhel_intel-wildcatpass-07/root rd.lvm.lv=rhel_intel-wildcatpass-07/swap console=ttyS0,115200n81 ignore_loglevel [10:57 AM root@intel-wildcatpass-07 grub-2.02]# ./grub-editenv - set kernelopts="root=/dev/mapper/rhel_intel--wildcatpass--07-root ro crashkernel=auto resume=/dev/mapper/rhel_intel--wildcatpass--07-swap rd.lvm.lv=rhel_intel-wildcatpass-07/root rd.lvm.lv=rhel_intel-wildcatpass-07/swap console=ttyS0,115200n81 ignore_loglevel newarg" [10:57 AM root@intel-wildcatpass-07 grub-2.02]# ./grub-editenv list saved_entry=0 next_entry= kernelopts=root=/dev/mapper/rhel_intel--wildcatpass--07-root ro crashkernel=auto resume=/dev/mapper/rhel_intel--wildcatpass--07-swap rd.lvm.lv=rhel_intel-wildcatpass-07/root rd.lvm.lv=rhel_intel-wildcatpass-07/swap console=ttyS0,115200n81 ignore_loglevel newarg which is cumbersome. Add functionality to add to an existing variable. For example, [10:58 AM root@intel-wildcatpass-07 grub-2.02]# ./grub-editenv list saved_entry=0 next_entry= kernelopts=root=/dev/mapper/rhel_intel--wildcatpass--07-root ro crashkernel=auto resume=/dev/mapper/rhel_intel--wildcatpass--07-swap rd.lvm.lv=rhel_intel-wildcatpass-07/root rd.lvm.lv=rhel_intel-wildcatpass-07/swap console=ttyS0,115200n81 ignore_loglevel [10:58 AM root@intel-wildcatpass-07 grub-2.02]# ./grub-editenv - set kernelopts+="newarg" [10:59 AM root@intel-wildcatpass-07 grub-2.02]# ./grub-editenv list saved_entry=0 next_entry= kernelopts=root=/dev/mapper/rhel_intel--wildcatpass--07-root ro crashkernel=auto resume=/dev/mapper/rhel_intel--wildcatpass--07-swap rd.lvm.lv=rhel_intel-wildcatpass-07/root rd.lvm.lv=rhel_intel-wildcatpass-07/swap console=ttyS0,115200n81 ignore_loglevel newarg Signed-off-by: Prarit Bhargava Cc: mleitner@redhat.com Cc: pjones@redhat.com Cc: javierm@redhat.com Cc: aruiz@redhat.com --- util/grub-editenv.c | 81 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 79 insertions(+), 2 deletions(-) diff --git a/util/grub-editenv.c b/util/grub-editenv.c index 5f87b09d924a..bc997c5312d0 100644 --- a/util/grub-editenv.c +++ b/util/grub-editenv.c @@ -201,6 +201,49 @@ write_envblk (const char *name, grub_envblk_t envblk) fclose (fp); } +struct extend_variable_data { + grub_envblk_t envblk; + const char *name; + const char *add; +}; + +static int +extend_variable_hook (const char *varname, const char *value, void *hook_data) +{ + char *new = NULL; + int ret = GRUB_ERR_NONE; + struct extend_variable_data *data = hook_data; + + if (grub_strcmp (data->name, varname)) + return GRUB_ERR_ITERATE_CONTINUE; + + /* Create the new entry.*/ + new = grub_zalloc (grub_strlen (value) + grub_strlen (data->add) + 2); + if (!new) + { + return GRUB_ERR_OUT_OF_MEMORY; + goto err; + } + grub_snprintf(new, grub_strlen (value) + grub_strlen (data->add) + 2, + "%s %s", value, data->add); + + /* Erase the current entry. */ + grub_envblk_delete (data->envblk, varname); + /* Add the updated entry. */ + if (! grub_envblk_set (data->envblk, varname, new)) + { + /* Restore the original entry. This should always work. */ + grub_envblk_set (data->envblk, varname, value); + ret = GRUB_ERR_EOF; + goto err; + } + + err: + grub_free(new); + return GRUB_ERR_ITERATE_STOP; + +} + static void set_variables (const char *name, int argc, char *argv[]) { @@ -210,18 +253,52 @@ set_variables (const char *name, int argc, char *argv[]) while (argc) { char *p; + struct extend_variable_data data; + int err; p = strchr (argv[0], '='); if (! p) grub_util_error (_("invalid parameter %s"), argv[0]); + /* Delete "=" to separate variable name and value */ *(p++) = 0; if (! grub_strlen(argv[0])) grub_util_error (_("No parameter specified")); - if (! grub_envblk_set (envblk, argv[0], p)) - grub_util_error ("%s", _("environment block too small")); + switch (*(p - 2)) + { + case '+': /* Extend a parameter */ + *(p - 2) = 0; /* Delete "+" from variable name */ + + data.envblk = envblk; + data.name = argv[0]; + data.add = p; + err = grub_envblk_iterate (envblk, &data, extend_variable_hook); + switch (err) + { + case GRUB_ERR_ITERATE_STOP: /* Success */ + break; + + case GRUB_ERR_OUT_OF_RANGE: + case GRUB_ERR_EOF: + grub_util_error ("%s", _("environment block too small")); + break; + + case GRUB_ERR_OUT_OF_MEMORY: + grub_util_error ("%s", _("out of memory")); + break; + + case GRUB_ERR_NONE: + grub_util_error (_("variable %s not found"), argv[0]); + break; + } + break; + + default: /* Add a new parameter */ + if (! grub_envblk_set (envblk, argv[0], p)) + grub_util_error ("%s", _("environment block too small")); + } argc--; argv++; -- 2.17.2