From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6641861377903296512 X-Received: by 2002:a1c:18d:: with SMTP id 135mr275416wmb.13.1546428859568; Wed, 02 Jan 2019 03:34:19 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:9d28:: with SMTP id k40ls5928488wre.12.gmail; Wed, 02 Jan 2019 03:34:19 -0800 (PST) X-Google-Smtp-Source: ALg8bN5hdqhSird6dT/bKY8xyxzL+DYsNyUALxwXe1uJavHbPwngRW/piZPZiZ1TJ1tLmFuoWGw7 X-Received: by 2002:a5d:62cc:: with SMTP id o12mr1414447wrv.15.1546428859075; Wed, 02 Jan 2019 03:34:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546428859; cv=none; d=google.com; s=arc-20160816; b=iLVAxy5W014twJTqlgQ5vnGMe0yDwsc64Idk1Er8gU4D9zUI/SfrOtFEPbWUuC465/ 2fvBw39MBxqmcC470JSr4RSbrhcjQ2EzpPHAQ1RntMR8YYcul7w6ITREZEL+tZcBWV/p pUYaJZQx8KJf+COlKeN6O3QQIHJvJoJVHNcHnUya8PgQdgBDK2lWUy/RH0I95J/nGvSu LX5nLiS6uyxlfmAPTxsrOTzqYD9EpghZBkzpqfiybiU3W8EOxW4aw0+NcHKR8LpTu6rP ZRP8lPhvkWrvjJT02QTm+DKqwZcObIIC7vauJiIqEglqhymMhqsL2G0H1uG7fz/cCCnI 8uyA== 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=egssWe8LHj+9m4bGjugZ4LEV0a2NXA93tygf1mh93znXj1vNLVlmeNMSrKOtH4LE/k cNL5JIo6OPNIWy6WU+XYUMDLO2nlGPFEoTUb3vw0f5kVictz0/feXiNlRIuT0ViitjIp 0vIosfJlufckDWxk/C+Y3wynkxpYApnPW/jO0JMTa+qpy9hXWCo26YZQUzSIxt0Q8jCv ZgepvLmDAZaTTu08cYV2ZsXMfm+SQC/gUJ32EgTdCfhFpDlA0QNOe2axpncOhYOkTKZ2 nKDb8PmJnqspRgUqaOCX5XQZZMhPTFZrLkWONXbyFECfiLXEKbimM3guSAAtHJyRRYl0 +gKw== 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 t84si966820wmt.2.2019.01.02.03.34.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Jan 2019 03:34:19 -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 x02BYIDS021157 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 2 Jan 2019 12:34:18 +0100 Received: from md1f2u6c.ad001.siemens.net (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x02BYIYN009562; Wed, 2 Jan 2019 12:34:18 +0100 From: Jan Kiszka To: isar-users Cc: Henning Schild Subject: [PATCH 3/7] bootimg-efi-isar: Retrieve boot disk during runtime Date: Wed, 2 Jan 2019 12:34:13 +0100 Message-Id: <0907e323e8a4ea2c83385f9a0a8f68f0b2b015b4.1546428857.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: pwvaZuH6pfNz 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