From patchwork Thu Dec 15 22:16:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 2332 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 15 Dec 2022 23:16:21 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f56.google.com (mail-wm1-f56.google.com [209.85.128.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 2BFMGLrh013492 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Dec 2022 23:16:21 +0100 Received: by mail-wm1-f56.google.com with SMTP id q21-20020a7bce95000000b003d236c91639sf136298wmj.8; Thu, 15 Dec 2022 14:16:21 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1671142575; cv=pass; d=google.com; s=arc-20160816; b=nMXqZAap8eEjvhWl0FblnuL3H6EvOtT4Akkk1kV0e2+y7F0M0FMBOqjU0dd1JuJLEu zIThfNg+flpc9nYswf+jA7D5qU/ts7UH87BiHcYsMPChujynxHvQ0AfLuLLik1+ORqvF NGDYnc4dSnmlwG9drsOWYtdXP879Yof58DZry1BRos9+XV6osdbLTs9HJl7oeH5mmMHL 1RPD+UbpF0FnyY1dQYtT++Wvu/2g86/0NRZSUbr2kbx6A3NbL2n1/LeHHJCGOOJ1SDOk e6CucmA2ypqCFdjpJCjEnEiNg8QuoTbjkH3bu57UAO643/V7I0Md1IBjgncBjIAb1eKn +bSQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:feedback-id:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=21ls7qInyCOqCtfqF48VxArP+giK0d3uqdkkOvzri8w=; b=YzTq92gpe69h844klRHi4cskbOJ3iA3vtKr4AYHMwDfhEi5hLxCSNhTfg4Ff9QTA4/ JSjG8zfkVyz1XOTTTwcYiBUH+APATT4Y0pEayl++B2SHY1DembKr3AGWD45CobxkLVvx hcYCWFnIWcQjlDe+TkfEV/OFDYk94W/1Sxb21h+VhcWCXo6rrewbJ5X4YDYN/j/67uhE M9Ss3nAlZiqtv1/TZU+z90FbBSnDKrtNuT8zaUaFpLKIYI8q010A4u2vXv9+QucspFHX kpfiC29IpHRcW1a9NOOtYKoJy5Z9KYc8gJSbw1YxNiQZJ3cHrDz/D4M2fs02rSMEOJOv 7WlA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=nulNtQE0; spf=pass (google.com: domain of fm-52304-20221215221614e44559465ed36139ec-pwmfmj@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-52304-20221215221614e44559465ed36139ec-PWMFmj@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:feedback-id:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=21ls7qInyCOqCtfqF48VxArP+giK0d3uqdkkOvzri8w=; b=CvCzbIe9ficuedanypBpj9yUSGuGuNqbo60TuR27+zPWP8kNoGv9Hvx2DaDcqTzFbv OMDc4/h1uUG9Cizepv9mUHZzSHplu+iQs9RFJeEe/XUA3y71eyqUy03hP+P8C3dsuzMB YJE+kKwoNemiP4hqN3BKpq3MuDwyzwVDi9oFnV9aV9/AQhSAFg2YtZvrnGzw1EDl3Dvx Gb2L9YCs0Ct2io8Mkk7QnOua8mx5eUpyiawdif7JWUj2d7a/OpBiDGB5JbOZVa6wiqTA nTdjZsc9i6YNTLQChg3PtCC5sgNBm+JL7IcVigQqyQbYME75jQGTjwK/FWVUx3b3BAFG uKuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=21ls7qInyCOqCtfqF48VxArP+giK0d3uqdkkOvzri8w=; b=hr60kkKH0Pc7Z2ljusl7ZGBBQnhLl1vxOOMJ6OQSFihkOtkdN8NlVRMbY/F9w1Rw46 /GHy8Qf1DWehmUoERlfS1TS9GbfFGuTXLF8w1pE8PbOfJxJ96Q5vUjAby0lvymega3gg jXEHTQNwaBflL19bvVzx+77rKz9CCzyjJnj2JAIrufldpKNu1JNV3H0BXQUbsajIIMr/ UQuPEXvDgUzbNU8cnM5O96/IQSmmLw0exRSm3y3wJO8NmMFCAq7M5YgQ/UoO/n/rZV7x 6GpQUem+ueRZWu5BCDHSMfaxbfOoA9ZWe3tfh/I5RYH10+0tM4t8r0KbU3VctF8bSN8I kgQA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AFqh2kpA/ZmdYFgEtAnF30WvoAJUXLe+3TC/Rav0c6cpynnK0c7tC5sY hlxx4AgtUXO8wz22JFvvjPs= X-Google-Smtp-Source: AMrXdXsBkmXnWHbNwpRcodLuJJBLLEQdM18/k8QHSgZAO6OibrZk3qolsTYyVOz+SMGO5W7Hzg68mw== X-Received: by 2002:a05:600c:b52:b0:3cf:59c9:4a4e with SMTP id k18-20020a05600c0b5200b003cf59c94a4emr226245wmr.17.1671142575887; Thu, 15 Dec 2022 14:16:15 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:230:b0:242:2700:8318 with SMTP id l16-20020a056000023000b0024227008318ls763061wrz.0.-pod-prod-gmail; Thu, 15 Dec 2022 14:16:15 -0800 (PST) X-Received: by 2002:a5d:6091:0:b0:242:2088:1546 with SMTP id w17-20020a5d6091000000b0024220881546mr24108367wrt.61.1671142575013; Thu, 15 Dec 2022 14:16:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671142574; cv=none; d=google.com; s=arc-20160816; b=dVLdVyiUIl9a7JUu5hGFAHQNVCR0CKj28SkJL9t0U2De078BgK+a0pWBZdBJzcKuCu n3xYs/i7yxjwqaSjrTItgn1ei0302MNY1LODF4g7+nYEJeCu0VppREODt19k1FrY2RwR Pw85kKtdpmmfImy4IhurRALHnldTr7x+IDihVZumFq+HE+ZTRpJdLLCiOH25zTq9l957 eEdEYceSqLv5luZ2ccLDqejFXwybAISVcauHdnXcamHtLYes5cxsMscR1CXgMRCq2L3a C8eJeW1KSXsGFzgwTXT2GGvGT9ofSPDruZbvcKuM7f3OlQZAkTfGZUYJW7dYdexvpJNd dOFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=iPkDTSG3PkWd7fjdxganf9f1h7Bw140bmwMAbADzcXM=; b=vnNWtqsyQbQXA/LyVS6PWtzud9Qf3iSCrprBRpkpxUnA8MFuVk6blLBGTjUgvLhSj6 NNV+e58F2ihq7AB4ogeagpxhFyaUc+YV9vQQzn+pEK00eP11W30xEJrs6MtFLoq/4EgU L9NEZMkia+3yady1iMlj7YA/z93B5alPi6EsXpTWdNX/G1XPxka/DugrauBJEiVLaONz tIXgdEvjJNob09UXeq9drnqllyqBQb2AR31fJ1OYbW1DptgqcN8hNgiuSEN3lM8CtkYP dYVusoTTWJyGuOemmIxRS0wpw3pbc3G/KmI8rlNomSDCuopDTwaR6PsxJftXTqd6l0Ff MSSw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=nulNtQE0; spf=pass (google.com: domain of fm-52304-20221215221614e44559465ed36139ec-pwmfmj@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-52304-20221215221614e44559465ed36139ec-PWMFmj@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id cy4-20020a056000400400b0025664a2d85bsi27933wrb.1.2022.12.15.14.16.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Dec 2022 14:16:14 -0800 (PST) Received-SPF: pass (google.com: domain of fm-52304-20221215221614e44559465ed36139ec-pwmfmj@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20221215221614e44559465ed36139ec for ; Thu, 15 Dec 2022 23:16:14 +0100 From: henning.schild@siemens.com To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH v6 5/6] meta-isar: install expand-on-first-boot in most images and add space Date: Thu, 15 Dec 2022 23:16:05 +0100 Message-Id: <20221215221606.5623-6-henning.schild@siemens.com> In-Reply-To: <20221215221606.5623-1-henning.schild@siemens.com> References: <20221215221606.5623-1-henning.schild@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-52304:519-21489:flowmailer X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=nulNtQE0; spf=pass (google.com: domain of fm-52304-20221215221614e44559465ed36139ec-pwmfmj@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-52304-20221215221614e44559465ed36139ec-PWMFmj@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Henning Schild Here we take the most common and generic images and add some empty space at the end of then. This will enable better interactive use of our example images since people will have some space to install some more packages. While the space seems fixed it really is open end if the mass storage happens to be bigger, because we install expand-on-first-boot as well. Signed-off-by: Henning Schild --- meta-isar/conf/machine/qemuamd64.conf | 1 + meta-isar/conf/machine/virtualbox.conf | 1 + meta-isar/conf/machine/vmware.conf | 1 + meta-isar/conf/multiconfig/qemuarm-bookworm.conf | 1 + meta-isar/scripts/lib/wic/canned-wks/expand-padding.wks.inc | 5 +++++ meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-btrfs.wks | 2 ++ meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks | 2 ++ meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks | 2 ++ 8 files changed, 15 insertions(+) create mode 100644 meta-isar/scripts/lib/wic/canned-wks/expand-padding.wks.inc diff --git a/meta-isar/conf/machine/qemuamd64.conf b/meta-isar/conf/machine/qemuamd64.conf index 6b40cb50702e..a1be5e5b113b 100644 --- a/meta-isar/conf/machine/qemuamd64.conf +++ b/meta-isar/conf/machine/qemuamd64.conf @@ -19,6 +19,7 @@ IMAGER_INSTALL_append_debian-bullseye = " ${SYSTEMD_BOOTLOADER_INSTALL} btrfs-pr IMAGE_PREINSTALL_append_debian-bullseye = " btrfs-progs" IMAGE_INSTALL += "sshd-regen-keys" +IMAGE_INSTALL += "expand-on-first-boot" QEMU_ARCH ?= "x86_64" QEMU_MACHINE ?= "q35" diff --git a/meta-isar/conf/machine/virtualbox.conf b/meta-isar/conf/machine/virtualbox.conf index de3d04c3c4b4..8c3e9bacbf9b 100644 --- a/meta-isar/conf/machine/virtualbox.conf +++ b/meta-isar/conf/machine/virtualbox.conf @@ -10,6 +10,7 @@ KERNEL_NAME ?= "amd64" WKS_FILE ?= "sdimage-efi" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" +IMAGE_INSTALL += "expand-on-first-boot" VMDK_SUBFORMAT = "monolithicSparse" IMAGE_FSTYPES ?= "ova" diff --git a/meta-isar/conf/machine/vmware.conf b/meta-isar/conf/machine/vmware.conf index fba639b19350..42503374742c 100644 --- a/meta-isar/conf/machine/vmware.conf +++ b/meta-isar/conf/machine/vmware.conf @@ -12,6 +12,7 @@ WKS_FILE ?= "sdimage-efi" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" OVF_TEMPLATE_FILE ?= "vm-img-vmware.ovf.tmpl" +IMAGE_INSTALL += "expand-on-first-boot" VMDK_SUBFORMAT = "streamOptimized" IMAGE_FSTYPES ?= "ova" diff --git a/meta-isar/conf/multiconfig/qemuarm-bookworm.conf b/meta-isar/conf/multiconfig/qemuarm-bookworm.conf index 126935b06fda..0b9ecb664545 100644 --- a/meta-isar/conf/multiconfig/qemuarm-bookworm.conf +++ b/meta-isar/conf/multiconfig/qemuarm-bookworm.conf @@ -7,3 +7,4 @@ IMAGE_FSTYPES_append = " wic" WKS_FILE ?= "sdimage-efi-sd" IMAGER_INSTALL += "${SYSTEMD_BOOTLOADER_INSTALL}" +IMAGE_INSTALL += "expand-on-first-boot" diff --git a/meta-isar/scripts/lib/wic/canned-wks/expand-padding.wks.inc b/meta-isar/scripts/lib/wic/canned-wks/expand-padding.wks.inc new file mode 100644 index 000000000000..701fba764176 --- /dev/null +++ b/meta-isar/scripts/lib/wic/canned-wks/expand-padding.wks.inc @@ -0,0 +1,5 @@ +# some extra space we put in the end after the last partition +# that allows testing expand-on-first-boot while at the same time +# making our images more useful because they have space to play around + +part --source empty --no-table --ondisk sda --size 256M diff --git a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-btrfs.wks b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-btrfs.wks index 014ecca61f0c..e22dba2f83f8 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-btrfs.wks +++ b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-btrfs.wks @@ -6,4 +6,6 @@ part /boot --source bootimg-efi-isar --sourceparams "loader=systemd-boot" --ondi part / --source rootfs --ondisk sda --fstype btrfs --label platform --align 1024 --use-uuid --exclude-path boot/ +include expand-padding.wks.inc + bootloader --ptable gpt --timeout 3 --append "rootwait console=ttyS0,115200 console=tty0" diff --git a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks index 754fbc46f8e4..7fe2953f5ff2 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks +++ b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks @@ -6,4 +6,6 @@ part /boot --source bootimg-efi-isar --sourceparams "loader=systemd-boot" --ondi part / --source rootfs --ondisk sda --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --use-uuid --exclude-path boot/ +include expand-padding.wks.inc + bootloader --ptable gpt --timeout 3 --append "rootwait console=ttyS0,115200 console=tty0" diff --git a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks index f3addbc7515d..80c3a5359b1f 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks +++ b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks @@ -6,4 +6,6 @@ part /boot --source bootimg-efi-isar --sourceparams "loader=grub-efi" --ondisk s part / --source rootfs --ondisk sda --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --use-uuid --exclude-path boot/ +include expand-padding.wks.inc + bootloader --ptable gpt --timeout 3 --append "rootwait console=ttyS0,115200 console=tty0"