From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6620265736346533888 X-Received: by 2002:a2e:9d4b:: with SMTP id y11-v6mr1722526ljj.20.1541400736351; Sun, 04 Nov 2018 22:52:16 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:67:: with SMTP id 100-v6ls2694344lja.15.gmail; Sun, 04 Nov 2018 22:52:15 -0800 (PST) X-Google-Smtp-Source: AJdET5d3vBnhZyIi7i1EfUrsIzqppDXKF4h6rWG6Ji2+AwQafR2tyceU+sXECHZSKPdwNNK6hOVn X-Received: by 2002:a2e:9902:: with SMTP id v2-v6mr877907lji.6.1541400735740; Sun, 04 Nov 2018 22:52:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541400735; cv=none; d=google.com; s=arc-20160816; b=v8+HyMJ1WNG/N/DxFnAzZZsHMN0rAtK2jC4MhJPH69JGvygTcsARYsiO7LspP/BVFS J30d0Tz5vZRWNhoy2uw4SMdP8Bmd1RgX6QQPQB35B0U2PymgmFI3wpYeGk87B3tMRcU1 d6XUt6Wv6grg1cXXjM1dVIS6Za3O/c/D6vSHWAUIPgB6kOSadNdaUk4r29lG22EMiHga 0K6wthY+6XqLjW0wdfoa4e2jXYwr/7VRM5m0FLHiQZbS2B/RjQdeNnEE5KFN54DQGbHI 4oSecnlFnra+eIpKk+mFN2rTNtswGYsYouDBBWEGQ7zebUXGOWiXs3ivgTUR2Y8iLyWT w+qg== 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=J5/6dfjZSRQUN+OUabzQcSWqHCQv1atvXoJa6gfuZUg=; b=HTdnzOE0uJVZx4ZaUjGvmV1n2ovRrR3A95nyYmbVojfOIr69IlharNk4ZO33n9/G/0 I9wmDg4jGHmjZGtOM24xmVbv+TchHt/rR0jK06PzkvGiLBm0nkCNzcdQpAhkVW6DxJxk TCp/0XTTf8D6ydSSCw7WbaoqCWkjAi42ab7YpbTv8oTEjUr5G6ekOM/yLflkVILhFKb6 QfQrX+xPGWfDVsVOFSgPaxug2xvpvxGwnzvKmcYiogsCEtUmgNCKf4mp/WSWh5d/gVUZ inbuOa8bUwVTMRqhtkS3QMfL3ToNDQ74Ar6E5jeapvlH/w9uRQV//O7ZDY51JPke0YOf QLEw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id 73-v6si1095721ljc.5.2018.11.04.22.52.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Nov 2018 22:52:15 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id wA56qE62028279 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 5 Nov 2018 07:52:14 +0100 Received: from md1f2u6c.ad001.siemens.net ([167.87.39.16]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id wA56qBn7011680 for ; Mon, 5 Nov 2018 07:52:14 +0100 From: Jan Kiszka To: isar-users Subject: [PATCH 09/10] wic: bootimg-efi-isar: Make agnostic to partition order Date: Mon, 5 Nov 2018 07:52:09 +0100 Message-Id: X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: 192oVee0nSN1 From: Jan Kiszka Replace the hard-coded assumptions about the partition order by the exact partition number as wic has calculated it for us. Signed-off-by: Jan Kiszka --- meta-isar/scripts/lib/wic/plugins/source/bootimg-efi-isar.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/meta-isar/scripts/lib/wic/plugins/source/bootimg-efi-isar.py b/meta-isar/scripts/lib/wic/plugins/source/bootimg-efi-isar.py index 38f6fc0..44ce399 100644 --- a/meta-isar/scripts/lib/wic/plugins/source/bootimg-efi-isar.py +++ b/meta-isar/scripts/lib/wic/plugins/source/bootimg-efi-isar.py @@ -44,7 +44,7 @@ class BootimgEFIPlugin(SourcePlugin): name = 'bootimg-efi-isar' @classmethod - def do_configure_grubefi(cls, creator, cr_workdir): + def do_configure_grubefi(cls, creator, cr_workdir, bootpart): """ Create loader-specific (grub-efi) config """ @@ -69,7 +69,9 @@ class BootimgEFIPlugin(SourcePlugin): grubefi_conf += "serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1\n" grubefi_conf += "default=boot\n" grubefi_conf += "timeout=%s\n" % bootloader.timeout - grubefi_conf += "set root='hd0,gpt2'\n" + for part in creator.parts: + if part.mountpoint == "/": + grubefi_conf += "set root='hd0,gpt%d'\n" % part.realnum grubefi_conf += "menuentry 'boot'{\n" kernel = "/vmlinuz" @@ -90,7 +92,7 @@ class BootimgEFIPlugin(SourcePlugin): cfg.close() cfg = open("%s/hdd/boot/EFI/BOOT/grub-mkimage.cfg" % cr_workdir, "w") - mkimage_conf = "set root='hd0,gpt1'\n" + mkimage_conf = "set root='hd0,gpt%d'\n" % bootpart.realnum mkimage_conf += "set prefix=($root)/EFI/BOOT\n" cfg.write(mkimage_conf) cfg.close() @@ -178,7 +180,7 @@ class BootimgEFIPlugin(SourcePlugin): try: if source_params['loader'] == 'grub-efi': - cls.do_configure_grubefi(creator, cr_workdir) + cls.do_configure_grubefi(creator, cr_workdir, part) elif source_params['loader'] == 'systemd-boot': cls.do_configure_systemdboot(hdddir, creator, cr_workdir, source_params) else: -- 2.16.4