From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6646963333394071552 X-Received: by 2002:a1c:8bcd:: with SMTP id n196mr540762wmd.4.1547616754338; Tue, 15 Jan 2019 21:32:34 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:5846:: with SMTP id m67ls128316wmb.8.canary-gmail; Tue, 15 Jan 2019 21:32:33 -0800 (PST) X-Google-Smtp-Source: ALg8bN7XxarqMnJn3DKLR2O2a//Nca6ZkZmA67V1foypJHSh+RFpLleneq0vXFORbPEBKir9l+B8 X-Received: by 2002:a1c:208c:: with SMTP id g134mr559087wmg.23.1547616753779; Tue, 15 Jan 2019 21:32:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547616753; cv=none; d=google.com; s=arc-20160816; b=k/C3VScpCzvqLUARWWYElDbNIulJHx6cCInxiIi5tL5vjvbvZVvvplMpawzOefaBNr vYlsVXBUyCwWa8uSU4Gbv/TKxOd+1Cst9j2DRAaTcQmzCO/tt0iHl7reqroynQIbufJf 5/SMVWwvpYOsHQmSOylYjE7rk6Qk1vOGaN5BiAsxmnokOCM3xxcZVrMHvybVPGORjixt 3XlL4Ax/7Fbmmo0dvf2RMcyp0DCQxaN2blXV/IHB+QbNNGI9k5GsM+bb1ON7EegJKq7b RODVQaZNXBChbsFnPfXY1lFSxGHWjYtd9EKevzSQ96//PsqarRsJqlzV3SaUwgI5FpVf goSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:to:from; bh=tgmlIECQcn5Orou5rd+Up2wYwNnB71h2VXxdtm5oss4=; b=fCMSEsbCAKJfGJrhqu9B00jIngvbaIkeCbrcjhScJ3Xei4Cid844/A8IMKCqKzt8jD cTf5l0L4W8shtHvIjhv0tNLQZs5q+i/+BZeerNno+tc8KnYqTnYDLnVNHCkZfTsl3OK5 nMY4DuIHQxG9vnamHWn6A3XJfdx1VsFhTEe02qRYjwtff+rIT1uUmFfLW5Bxs/REwTuN bgAdivpgIiL3hFbixkQ6OkPazZnGa7OKICtCQMj9kQ9JQ+Z60jvEQY4qAd8TjEb2Os5O bQpnFNcAWZ1al5L8fWBvGYPSkxGAD5kTmNVtXvKmkQ3tn4oSxHPjEP3ZFUPzcoubHcC3 OTvQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id y6si652866wmd.1.2019.01.15.21.32.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Jan 2019 21:32:33 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id x0G5WXfB002027 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 16 Jan 2019 06:32:33 +0100 Received: from md1f2u6c.ad001.siemens.net ([167.87.33.125]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x0G5WRoR011496 for ; Wed, 16 Jan 2019 06:32:33 +0100 From: Jan Kiszka To: isar-users Subject: [PATCH v3 09/14] bootimg-efi-isar: Reformat generated grub.cfg Date: Wed, 16 Jan 2019 06:32:22 +0100 Message-Id: <77ded2ceb727ea17befee9a5e587bfc182f05b1d.1547616747.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: NEJEL7KprW4d From: Jan Kiszka Remove unneeded variables for kernel and initrd to make the code more readable. Indent menu entry to make the conf file more readable. Signed-off-by: Jan Kiszka --- meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py index c6a6a02..25b12ca 100644 --- a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py +++ b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py @@ -75,17 +75,11 @@ class BootimgEFIPlugin(SourcePlugin): if part.mountpoint == "/": grubefi_conf += "regexp --set bootdisk '(hd[0-9]*),' $prefix\n" grubefi_conf += "set root=$bootdisk',gpt%d'\n" % part.realnum + grubefi_conf += "\n" grubefi_conf += "menuentry 'boot'{\n" - - kernel = "/vmlinuz" - - grubefi_conf += "linux %s root=%s rootwait %s\n" \ - % (kernel, creator.rootdev, bootloader.append or "") - - initrd = "/initrd.img" - - grubefi_conf += "initrd %s\n" % initrd - + grubefi_conf += " linux /vmlinuz root=%s rootwait %s\n" \ + % (creator.rootdev, bootloader.append or "") + grubefi_conf += " initrd /initrd.img\n" grubefi_conf += "}\n" logger.debug("Writing grubefi config %s/hdd/boot/EFI/BOOT/grub.cfg", -- 2.16.4