From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6646963335289896960 X-Received: by 2002:a1c:96d2:: with SMTP id y201mr601125wmd.3.1547616751528; Tue, 15 Jan 2019 21:32:31 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:dc04:: with SMTP id t4ls127954wmg.12.gmail; Tue, 15 Jan 2019 21:32:31 -0800 (PST) X-Google-Smtp-Source: ALg8bN5WzLhKy7RKxZNKdZbGsnwujI9IXzqmXMgcKfmTIODG9EkA5ASc5+hNsIB2fW/bxPb3XLIi X-Received: by 2002:a1c:6708:: with SMTP id b8mr615354wmc.5.1547616751043; Tue, 15 Jan 2019 21:32:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547616751; cv=none; d=google.com; s=arc-20160816; b=r6JnmkrUEOnk+qWTx3qbGPOU7rgK/td6D4qNq3jIXMAlJp5zQiAGc8h3F13HWC8XOZ G3G6Jhqx93nFa0M/ZFdMByixvB+Dmz3y9GyAYL7kSzpVN8rITGefv2fM+wOe7iEq3lRe NzAG4kZQa4ip41I50fhzvQQelmmTToNDX1iG0+5xE3iCb43tKPPWXCRZjNKWt5fdTSg6 k+1Z5HdYB1YY7+4ua9T90C8CBp1KnnuddfsG42Awulo+4Eg8r8XXULA8tkvWNZFn+QqH 2iKSO1gMSisYEflZ4+R1IfxQfJMe+xKgv3TinE00FnJr6hNMO/jwc5K/1/izFIyoRhLB GBjQ== 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:cc:to:from; bh=TAT0zfbDu5DVmhfLCtOtgpX5+OvibSaVQGiXzE087I8=; b=sz3o/7mcgoXGD3IWb5hCOQUZTuIozc9LH0wznZNpbrHluEJ2r8NJ263ydYELrABmcX tXyslzIkTAN7Lab4uIwIuxX0H6LPRU2suAmfxWXSbwUYlnBjUk1RO2iIYGwOJX35/qCS 7sVdY7Fcu9xBi/uAEniQVUins14vb0icZ5JkRy8ZLqMnSOg7JhI4yMSBI0ai+c0pMJVv ACOAben68UvEhf6/wstS1TGBB9BNHpcqW1jq87dUgHmLa9q9qP2r9PgSnogbyDczRfC9 r4lY0feDRZlBSA4wlnfErKPjtDms3W+2Lz8i3XG/YzEdfTwGKiHUw3tqbusPNjRebpbF X9Rw== 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 z207si1384011wmc.2.2019.01.15.21.32.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Jan 2019 21:32:31 -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 x0G5WUbR023577 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 16 Jan 2019 06:32:30 +0100 Received: from md1f2u6c.ad001.siemens.net ([167.87.33.125]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x0G5WRoL011496; Wed, 16 Jan 2019 06:32:30 +0100 From: Jan Kiszka To: isar-users Cc: Henning Schild Subject: [PATCH v3 03/14] bootimg-efi-isar: Retrieve boot disk during runtime Date: Wed, 16 Jan 2019 06:32:16 +0100 Message-Id: X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: c+PLgi1OMyxC From: Jan Kiszka Use regexp on 'prefix' in order to define the boot disk. This still binds boot and root partition to the same disk but at least removes the assumption that this is hd0. CC: Henning Schild Signed-off-by: Jan Kiszka --- meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py | 5 +++-- 1 file changed, 3 insertions(+), 2 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 0d5d018..1ca200f 100644 --- a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py +++ b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py @@ -71,7 +71,8 @@ class BootimgEFIPlugin(SourcePlugin): grubefi_conf += "timeout=%s\n" % bootloader.timeout for part in creator.parts: if part.mountpoint == "/": - grubefi_conf += "set root='hd0,gpt%d'\n" % part.realnum + grubefi_conf += "regexp --set bootdisk '(hd[0-9]*),' $prefix\n" + grubefi_conf += "set root=$bootdisk',gpt%d'\n" % part.realnum grubefi_conf += "menuentry 'boot'{\n" kernel = "/vmlinuz" @@ -245,7 +246,7 @@ class BootimgEFIPlugin(SourcePlugin): grub_cmd += "terminal minicmd test loadenv echo help " grub_cmd += "reboot serial terminfo iso9660 loopback tar " grub_cmd += "memdisk ls search_fs_uuid udf btrfs xfs lvm " - grub_cmd += "reiserfs " + grub_modules + grub_cmd += "reiserfs regexp " + grub_modules exec_cmd(grub_cmd) elif source_params['loader'] == 'systemd-boot': for mod in [x for x in os.listdir(kernel_dir) if x.startswith("systemd-")]: -- 2.16.4