From patchwork Wed Jun 6 13:59:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 925860 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4119Lm3DwszB3sn for ; Thu, 7 Jun 2018 00:01:04 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4119Ll6LV7zF31L for ; Thu, 7 Jun 2018 00:01:03 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com X-Original-To: petitboot@lists.ozlabs.org Delivered-To: petitboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=redhat.com (client-ip=209.85.128.194; helo=mail-wr0-f194.google.com; envelope-from=javierm@redhat.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4119KP2htyzDrq6 for ; Wed, 6 Jun 2018 23:59:53 +1000 (AEST) Received: by mail-wr0-f194.google.com with SMTP id h10-v6so6416192wrq.8 for ; Wed, 06 Jun 2018 06:59:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZR0iVUJ1GdjfUxfUVe/jOLkvB0GGeIhlZkOOT+RvAlA=; b=Gs4i2o7SukWCPOIBNIvlwrvpm3ugeO3fuxETITBLmFxS0/OIjkRrvTXZW+/Yw6EZUr RauaZ6+9t54gWLK3tkwfh7fEUm8k9p0hC4mXD8aLji4amDjZfiRoZy/Iv6rJhesI0Q2B HhkLxTvpzKP890Xw3nlpAY8voy9NfT4h0rddQxtzq9Nwh+ltBblVTqc9Jts536LtCwWU Tr/B5nwia/e1bVKcOt7g2HIlC9e7/j/h6oYTcj1CWVFgi9L+bwNT8CUKnTNFn3POF42C dpCW915IQbGk9EF0lwfibHHNP5b3FuRLJ1aaf3onohl24gR5E2jp/qBOy2C0zFK9Gv78 CH1A== X-Gm-Message-State: APt69E0lkEvc51d2watXk2+qqRx5+yo/YIveznql/BGKd0zWIZ76UNYJ VFz+CXZZYXAG6IUj8ZIJVkn5UOC5nNs= X-Google-Smtp-Source: ADUXVKJ1cmNLRL5v39XTUVMlQeOvL0qTYDJaaUd5sfeojMqjfnQbqHhAHPuTqu+RpumYE8m/lAs0xg== X-Received: by 2002:adf:ad4c:: with SMTP id p70-v6mr2288572wrc.44.1528293588818; Wed, 06 Jun 2018 06:59:48 -0700 (PDT) Received: from minerva.home ([90.77.100.34]) by smtp.gmail.com with ESMTPSA id a184-v6sm4953961wmf.30.2018.06.06.06.59.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 06 Jun 2018 06:59:48 -0700 (PDT) From: Javier Martinez Canillas To: petitboot@lists.ozlabs.org Subject: [PATCH 3/3] discover/grub: Improve BLS grub environment variables expansion Date: Wed, 6 Jun 2018 15:59:36 +0200 Message-Id: <20180606135936.2461-4-javierm@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180606135936.2461-1-javierm@redhat.com> References: <20180606135936.2461-1-javierm@redhat.com> X-BeenThere: petitboot@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Petitboot bootloader development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Javier Martinez Canillas , Peter Jones , Jan Hlavac , Samuel Mendoza-Jonas MIME-Version: 1.0 Errors-To: petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Petitboot" The fields from a BootLoaderSpec file can contain environment variables, in GRUB 2 these are show verbatim and are evaluated later when an entry is selected. But on Petitboot these have to be expanded before creating the GRUB 2 resources and show in the UI the values after the evaluation. The current blscfg handler had a very limited support for variables, it only had support for the options field and also didn't take into account that variables could be mixed with literal values. So for example the following fields were not expanded correctly: linux $bootprefix/vmlinuz options $kernelopts foo=bar options foo=bar $kernelopts options $kernelopts $debugopts Also change some of the tests to cover mixing variables and literals. Signed-off-by: Javier Martinez Canillas --- discover/grub2/blscfg.c | 84 ++++++++++++++++---- test/parser/test-grub2-blscfg-multiple-bls.c | 5 +- test/parser/test-grub2-blscfg-opts-grubenv.c | 4 +- 3 files changed, 73 insertions(+), 20 deletions(-) diff --git a/discover/grub2/blscfg.c b/discover/grub2/blscfg.c index a3813064a0a..46382ed0cbb 100644 --- a/discover/grub2/blscfg.c +++ b/discover/grub2/blscfg.c @@ -2,6 +2,7 @@ #define _GNU_SOURCE #include +#include #include #include #include @@ -34,54 +35,105 @@ struct bls_state { const char *dtb; }; +static char *field_append(struct bls_state *state, int type, char *buffer, + char *start, char *end) +{ + char *temp = talloc_strndup(state, start, end - start + 1); + temp[end - start + 1] = '\0'; + const char *field = temp; + + if (type == GRUB2_WORD_VAR) { + field = script_env_get(state->script, temp); + if (!field) + return buffer; + } + + if (!buffer) + buffer = talloc_strdup(state->opt, field); + else + buffer = talloc_asprintf_append(buffer, "%s", field); + + return buffer; +} + +static char *expand_field(struct bls_state *state, char *value) +{ + char *buffer = NULL; + char *start = value; + char *end = value; + int type = GRUB2_WORD_TEXT; + + while (*value) { + if (*value == '$') { + if (start != end) { + buffer = field_append(state, type, buffer, + start, end); + } + + type = GRUB2_WORD_VAR; + start = value + 1; + } else if (type == GRUB2_WORD_VAR) { + if (!isalnum(*value) && *value != '_') { + buffer = field_append(state, type, buffer, + start, end); + type = GRUB2_WORD_TEXT; + start = value; + } + } + + end = value; + value++; + } + + if (start != end) { + buffer = field_append(state, type, buffer, + start, end); + if (!buffer) + return NULL; + } + + return buffer; +} + static void bls_process_pair(struct conf_context *conf, const char *name, char *value) { struct bls_state *state = conf->parser_info; struct discover_boot_option *opt = state->opt; struct boot_option *option = opt->option; - const char *boot_args; if (streq(name, "title")) { - state->title = talloc_strdup(state, value); + state->title = expand_field(state, value); return; } if (streq(name, "version")) { - state->version = talloc_strdup(state, value); + state->version = expand_field(state, value); return; } if (streq(name, "machine-id")) { - state->machine_id = talloc_strdup(state, value); + state->machine_id = expand_field(state, value); return; } if (streq(name, "linux")) { - state->image = talloc_strdup(state, value); + state->image = expand_field(state, value); return; } if (streq(name, "initrd")) { - state->initrd = talloc_strdup(state, value); + state->initrd = expand_field(state, value); return; } if (streq(name, "devicetree")) { - state->dtb = talloc_strdup(state, value); + state->dtb = expand_field(state, value); return; } if (streq(name, "options")) { - if (value[0] == '$') { - boot_args = script_env_get(state->script, value + 1); - if (!boot_args) - return; - - option->boot_args = talloc_strdup(opt, boot_args); - } else { - option->boot_args = talloc_strdup(opt, value); - } + option->boot_args = expand_field(state, value); return; } } diff --git a/test/parser/test-grub2-blscfg-multiple-bls.c b/test/parser/test-grub2-blscfg-multiple-bls.c index 94f40d191fa..d15fb24fd7e 100644 --- a/test/parser/test-grub2-blscfg-multiple-bls.c +++ b/test/parser/test-grub2-blscfg-multiple-bls.c @@ -1,6 +1,7 @@ #include "parser-test.h" #if 0 /* PARSER_EMBEDDED_CONFIG */ +set os_name=Fedora blscfg #endif @@ -13,14 +14,14 @@ void run_test(struct parser_test *test) test_add_file_string(test, test->ctx->device, "/loader/entries/6c063c8e48904f2684abde8eea303f41-4.15.2-302.fc28.x86_64.conf", - "title Fedora (4.15.2-302.fc28.x86_64) 28 (Twenty Eight)\n" + "title $os_name (4.15.2-302.fc28.x86_64) 28 (Twenty Eight)\n" "linux /vmlinuz-4.15.2-302.fc28.x86_64\n" "initrd /initramfs-4.15.2-302.fc28.x86_64.img\n" "options root=/dev/mapper/fedora-root ro rd.lvm.lv=fedora/root\n\n"); test_add_file_string(test, test->ctx->device, "/loader/entries/6c063c8e48904f2684abde8eea303f41-4.14.18-300.fc28.x86_64.conf", - "title Fedora (4.14.18-300.fc28.x86_64) 28 (Twenty Eight)\n" + "title $os_name (4.14.18-300.fc28.x86_64) 28 (Twenty Eight)\n" "linux /vmlinuz-4.14.18-300.fc28.x86_64\n" "initrd /initramfs-4.14.18-300.fc28.x86_64.img\n" "options root=/dev/mapper/fedora-root ro rd.lvm.lv=fedora/root\n"); diff --git a/test/parser/test-grub2-blscfg-opts-grubenv.c b/test/parser/test-grub2-blscfg-opts-grubenv.c index 544a5de4d23..2dffd1b730c 100644 --- a/test/parser/test-grub2-blscfg-opts-grubenv.c +++ b/test/parser/test-grub2-blscfg-opts-grubenv.c @@ -22,7 +22,7 @@ void run_test(struct parser_test *test) "title Fedora (4.15.2-302.fc28.x86_64) 28 (Twenty Eight)\n" "linux /vmlinuz-4.15.2-302.fc28.x86_64\n" "initrd /initramfs-4.15.2-302.fc28.x86_64.img\n" - "options $kernelopts\n"); + "options $kernelopts debug\n"); test_read_conf_embedded(test, "/boot/grub2/grub.cfg"); @@ -32,5 +32,5 @@ void run_test(struct parser_test *test) opt = get_boot_option(ctx, 0); - check_args(opt, "root=/dev/mapper/fedora-root ro rd.lvm.lv=fedora/root"); + check_args(opt, "root=/dev/mapper/fedora-root ro rd.lvm.lv=fedora/root debug"); }