From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7176574728906211328 X-Received: by 2002:a7b:ce85:0:b0:3d1:e3ba:3bb6 with SMTP id q5-20020a7bce85000000b003d1e3ba3bb6mr133023wmj.29.1670926513447; Tue, 13 Dec 2022 02:15:13 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1c11:b0:3cf:9be3:73dd with SMTP id j17-20020a05600c1c1100b003cf9be373ddls11778526wms.3.-pod-canary-gmail; Tue, 13 Dec 2022 02:15:12 -0800 (PST) X-Google-Smtp-Source: AA0mqf6328gRpYxIbYFlRRksLm9U55LQmbjhrLYwQRIl+krV2ed41Sxq46cCQ5Hyd38Ieg2+5Z5G X-Received: by 2002:a05:600c:d4:b0:3d1:e1f4:21dc with SMTP id u20-20020a05600c00d400b003d1e1f421dcmr14808028wmm.14.1670926512381; Tue, 13 Dec 2022 02:15:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670926512; cv=none; d=google.com; s=arc-20160816; b=ybBqvMBPJuw1UKs+7UC0TEg6JlZLoXGUDe5VL2M3mmwAupfQHaCFKWz8zH24HNnGRl Wh1Gb/rEyMGcqgzKULyMA9/bHrAVOnA6TCCFaBpRvQmpg1B685PJOnFsoQzP0vLUrtln zeUkHRpA3KdzA0NVenR5V8jXuWf7HOgCbmpFEoZtoCUIcbh1jIbAlSJFRaEQU00vSAdl 9H7k7va3VCX06R6OwdheYIcHHAsaY28vf5BcZ84tpwpYBSuSy9S6ADH7j8SKHLDr1B6N gH0+UhvbS+OAgCOGcEf/JDiJmA4mORtcLCTmPPrmt29YvS7qPPTdPVcn8WjGip8dRkni vdWA== 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=RjC80W1YfYS+YsmOjz0qlb2IWUKGyovU13VGpz95si7x21Kstcs8mDOFyhkRXdgFY1 b0qjSZNWj5k9LAmJq8RGUNyuzmMvyYxMGV/1BhHmU+7SY4TzG8I2FSmuCkZSLB1Uc86E wlgiGwB5hHHWTCo4lZxayQLl0J6VHdMrHH4U/iJKEBO2TfC7PlERrzDH+4NKjbBMRaoc Pk0WadLUWay7OU4MYwTmvSM0JGqVm5FeaK3e8+kJvxontq3FgUKTpR/vU+ZAgr5eN0i2 wuImKfoljYkZp5dTxzshnOHEXbu9GgsVNJhKS30PUzWPmtRqAjG/jA03/KuvKOyQYRdH pRdg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Gj40ezWd; spf=pass (google.com: domain of fm-52304-20221213101512fa24f5d1488fa51c79-tqoyvg@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-52304-20221213101512fa24f5d1488fa51c79-tQOyVg@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id j4-20020a05600c42c400b003d2051f87ffsi590009wme.2.2022.12.13.02.15.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Dec 2022 02:15:12 -0800 (PST) Received-SPF: pass (google.com: domain of fm-52304-20221213101512fa24f5d1488fa51c79-tqoyvg@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Gj40ezWd; spf=pass (google.com: domain of fm-52304-20221213101512fa24f5d1488fa51c79-tqoyvg@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-52304-20221213101512fa24f5d1488fa51c79-tQOyVg@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 20221213101512fa24f5d1488fa51c79 for ; Tue, 13 Dec 2022 11:15:12 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=henning.schild@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=iPkDTSG3PkWd7fjdxganf9f1h7Bw140bmwMAbADzcXM=; b=Gj40ezWdqxgrr22Jfx0a7zKia0zuQedn2/91bHZYZC786KY2CfBQ+pmK3AiUjy/9DR5hjU KFV5mn3B6/WpQEjQlkwi4K7aoACT7MSbFwoWr680w6WMIcgZPL6np5yKYoktOoLRYrPzcDpK +4HQolWOG+/g/nG4uRuX4e2H823So=; From: henning.schild@siemens.com To: isar-users@googlegroups.com Cc: felix.moessbauer@siemens.com, "Roberto A . Foglietta" , Joe MacDonald , Henning Schild Subject: [PATCH v4 4/5] meta-isar: install expand-on-first-boot in most images and add space Date: Tue, 13 Dec 2022 11:15:08 +0100 Message-Id: <20221213101509.535-5-henning.schild@siemens.com> In-Reply-To: <20221213101509.535-1-henning.schild@siemens.com> References: <20221213101509.535-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-52304:519-21489:flowmailer X-TUID: 1S+flAQWPpCa 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" -- 2.37.4