From: Jan Kiszka <jan.kiszka@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Subject: [PATCH v3 09/14] bootimg-efi-isar: Reformat generated grub.cfg
Date: Wed, 16 Jan 2019 06:32:22 +0100 [thread overview]
Message-ID: <77ded2ceb727ea17befee9a5e587bfc182f05b1d.1547616747.git.jan.kiszka@siemens.com> (raw)
In-Reply-To: <cover.1547616747.git.jan.kiszka@siemens.com>
In-Reply-To: <cover.1547616747.git.jan.kiszka@siemens.com>
From: Jan Kiszka <jan.kiszka@siemens.com>
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 <jan.kiszka@siemens.com>
---
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
next prev parent reply other threads:[~2019-01-16 5:32 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-16 5:32 [PATCH v3 00/14] Vacation hacks & more Jan Kiszka
2019-01-16 5:32 ` [PATCH v3 01/14] dpkg-raw: Respect file permissions defined by recipe if requested Jan Kiszka
2019-01-16 9:41 ` Henning Schild
2019-01-16 12:11 ` Jan Kiszka
2019-01-16 15:24 ` Henning Schild
2019-01-16 19:09 ` Jan Kiszka
2019-01-18 9:01 ` Henning Schild
2019-01-16 5:32 ` [PATCH v3 02/14] bootimg-efi-isar: Run grub-mkimage without own config Jan Kiszka
2019-01-16 5:32 ` [PATCH v3 03/14] bootimg-efi-isar: Retrieve boot disk during runtime Jan Kiszka
2019-01-16 5:32 ` [PATCH v3 04/14] isar-cfg-localepurge: Also set /etc/default/locale Jan Kiszka
2019-01-16 5:32 ` [PATCH v3 05/14] Fix LIC_FILES_CHKSUM paths Jan Kiszka
2019-01-16 5:32 ` [PATCH v3 06/14] Move repo variables to proper conf file Jan Kiszka
2019-01-16 5:32 ` [PATCH v3 07/14] Move debian distro conf files to meta Jan Kiszka
2019-01-17 16:34 ` Maxim Yu. Osipov
2019-01-16 5:32 ` [PATCH v3 08/14] bootimg-efi-isar: Fix serial console setup for grub Jan Kiszka
2019-01-16 9:47 ` Henning Schild
2019-01-16 12:17 ` Jan Kiszka
2021-09-01 9:11 ` Henning Schild
2021-09-01 10:02 ` Jan Kiszka
2019-01-16 5:32 ` Jan Kiszka [this message]
2019-01-16 5:32 ` [PATCH v3 10/14] scripts: Add rpm2cpio.sh Jan Kiszka
2019-01-16 5:32 ` [PATCH v3 11/14] rootfs-u-boot: Handle empty kernel command line appendix Jan Kiszka
2019-01-16 5:32 ` [PATCH v3 12/14] bitbake.conf: Clean up and enhance OVERRIDES Jan Kiszka
2019-01-16 5:32 ` [PATCH v3 13/14] linux-module: Simplify interface to module makefiles Jan Kiszka
2019-01-16 5:32 ` [PATCH v3 14/14] example-module: Use simplified custom module interface Jan Kiszka
2019-01-18 7:53 ` [PATCH v3 00/14] Vacation hacks & more Maxim Yu. Osipov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=77ded2ceb727ea17befee9a5e587bfc182f05b1d.1547616747.git.jan.kiszka@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox