From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6641861376070385664 X-Received: by 2002:a1c:7d03:: with SMTP id y3mr152684wmc.8.1546609805072; Fri, 04 Jan 2019 05:50:05 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:4987:: with SMTP id w129ls194389wma.13.gmail; Fri, 04 Jan 2019 05:50:04 -0800 (PST) X-Google-Smtp-Source: ALg8bN7ehpYufATJ+VJwYitlk/1lyvipL2oz0rn0Nq7C2xx+u+waet0eVIexUzun0+PpzWdz2TcW X-Received: by 2002:a1c:96d2:: with SMTP id y201mr156121wmd.3.1546609804554; Fri, 04 Jan 2019 05:50:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546609804; cv=none; d=google.com; s=arc-20160816; b=tUYrThME5IiRTXbsfQX3yLtxgMkx1LVDbSm2B4suRmZwRCVc1jjD2pGUIUuUf+5rji TbWj56iZQ/18D+sLdZVemtZ7YkcfZoKbU3dj5G4mEjon3E+pHk7WLvCf2QqYaQ7aIFZt G9RvdpI5QP0gUSHM6gco+2A3sBy1ZQtC2Qr4UlHZtXZWuFmJ/ImtQ2L1+yMCuZXIK3LJ 5VCSMHNmA9BHwG+MD4bpIZB5frxjhoY7VrAx+mCFpmN/YS80+wp9icI6Jdft8Q9hmHTB tkygXg+6aUc+6S0O3OGseG4T7zgLCW+UrTJvNRJWyL2RH/sTSTfhNZ3rgZNHfWinJX2O zEJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:references:cc:to:from:subject; bh=tgmlIECQcn5Orou5rd+Up2wYwNnB71h2VXxdtm5oss4=; b=Xjf5w4QTCShxp8gHju0KVDoJ0Xpyv54ccsRgyw+vltzAvdI12d2clJimNmh29+rltH v6A+HaOU22EGXyJygxnzVTAq4cHDsLa6z0i1TSgJuetC6PKfb/kFDNRRN3X2E0BO/LDq S9U3/w3DSRcM9ITPSQeiwuib7QyqJAIQAYSr/nYnh2fmlHqSuNPFoxlWuiE7ETTE/ZWD VhHfLXCqdklqWWINW2s6n3bosFjMCuuA61AttvPC/9DIz4psI6A/zO87cItXuU3RG0aU ASDUv7+fCoas28u3uonVb3aaxjv6VdO7PcCxfdLg0yE1rsKa0i9OLHWRieeeIrIOTnoP Zh3A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id z207si43323wmc.2.2019.01.04.05.50.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Jan 2019 05:50:04 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id x04Do4Ig028804 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 4 Jan 2019 14:50:04 +0100 Received: from [139.25.68.37] (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x04Do3E2015878; Fri, 4 Jan 2019 14:50:04 +0100 Subject: [PATCH 9/7] bootimg-efi-isar: Reformat generated grub.cfg From: Jan Kiszka To: isar-users Cc: Henning Schild References: Message-ID: <735e8cb5-50aa-31b8-5d41-30daec85d78f@siemens.com> Date: Fri, 4 Jan 2019 14:50:03 +0100 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: yUgB0rpw4/az 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