Message ID | 20221116143614.24348-3-henning.schild@siemens.com |
---|---|
State | Superseded, archived |
Headers | show |
Series | expand-on-first-boot CI testing | expand |
diff --git a/meta-isar/conf/machine/qemuamd64.conf b/meta-isar/conf/machine/qemuamd64.conf index eca2628c4ae5..785a104b8fc9 100644 --- a/meta-isar/conf/machine/qemuamd64.conf +++ b/meta-isar/conf/machine/qemuamd64.conf @@ -14,6 +14,7 @@ WKS_FILE_ubuntu-focal ?= "sdimage-efi-sd" IMAGER_INSTALL_remove_ubuntu-focal = "${GRUB_BOOTLOADER_INSTALL}" 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/sdimage-efi-sd.wks b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks index 754fbc46f8e4..e6b7128eb3ae 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/ +part --source empty --no-table --ondisk sda --size 256M + 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..5e555b3cc472 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/ +part --source empty --no-table --ondisk sda --size 256M + bootloader --ptable gpt --timeout 3 --append "rootwait console=ttyS0,115200 console=tty0"
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 <henning.schild@siemens.com> --- 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/sdimage-efi-sd.wks | 2 ++ meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks | 2 ++ 6 files changed, 8 insertions(+)