From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7176574728906211328 X-Received: by 2002:a5d:4705:0:b0:26b:70d2:a2ee with SMTP id y5-20020a5d4705000000b0026b70d2a2eemr385982wrq.285.1671785755887; Fri, 23 Dec 2022 00:55:55 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f548:0:b0:225:6559:3374 with SMTP id j8-20020adff548000000b0022565593374ls2245778wrp.2.-pod-prod-gmail; Fri, 23 Dec 2022 00:55:54 -0800 (PST) X-Google-Smtp-Source: AMrXdXu37b1OiFeNcIZya/jGFtr6qQbK/O7gCXBtG2TXMkthxTt5lV6AkzryvxxLgtpP3h/HVd1g X-Received: by 2002:adf:f1c9:0:b0:271:808e:ad8b with SMTP id z9-20020adff1c9000000b00271808ead8bmr3010630wro.34.1671785754877; Fri, 23 Dec 2022 00:55:54 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1671785754; cv=pass; d=google.com; s=arc-20160816; b=aNT91Fnl0haEMTWbhGsVs3h2sNseW2cyNNROXXPdQxUCjUOlt+kgRFAIBtHwwaXakV sBSybL0Ifpn9rQE/Ek8H9GFab0PeatZRw+8Cq1Pmf6piYSLu7aKquGsrn+x1Lp/sBvof VYqkH6UlpxZ8hRhXyVTpyH6yn7m/t6qWieCHxrGMsO9m3+e3ehtxdC4DDE6QDSIlHT4o BbZ6y6GIEp2IG6ZOIUxpDAXGBpD3dohQ1j5KX6sEDJnqqo8DLDfDOfn4dvw0W/Tpz//H X7fnpgoI57byA/WOU5yKD4KVPEBA0D7h6Da2qyAiVnd40Qgkc+Iy2oGNW5nZO3eJq4V5 s0NQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=dkF0ibjbzFXMbQOWReGGngnmbacMZRHwUWG3pgIY8Ks=; b=S+yBAWeB9ob9hWpOXshwwpNmjIR2KJtcYUVZaghYsP/Ls0hBqg5vNLtF22uAqITem+ R6uKOCgfmkc4IOIwtYHSXh4TCqsr5bH0W5wcAMNfbYinNXKFWKaK/Ck5xYRR06653O+h /EK8h5LPe6FPHvIZjl8LKzLRlo4xZjshxTHKbyL3Cy8s/VnfBzaMgpV2H2qNykOPKxU6 at/VrGzwSNK4kqB3K98K5UmRUGr+ku1zcYwXPNRtqyvLEmz+A/CtDsiynuYSvMQoNtKu yyTHZr5avbafbyEaVI/K8+1Nt46uW1Dxf+z1SyY4XnOeUA6YtooKuI4RYGoy8ygY+qJS 1WRQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="E/Jic5zm"; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.6.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on2040.outbound.protection.outlook.com. [40.107.6.40]) by gmr-mx.google.com with ESMTPS id l17-20020a056000023100b0024222ed1370si141994wrz.3.2022.12.23.00.55.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Dec 2022 00:55:54 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.6.40 as permitted sender) client-ip=40.107.6.40; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="E/Jic5zm"; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.6.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HKnQeEoUh69na2s+Ahw7hRfpHn4kCsPVU9SVGPhuwHhfkJxbtpMd/v6u+Gv3+KN+byozlO+zZn/7D7G8JFbKQ0uGXtzZzobRxtfZ/9lK+F8htmrQgpZTlvcf+jgIbm7yDXMicl9CzCaToDx0+u9/Cl3WYEMUom40YZrh+8jh71Iqzkc8SSqIoBTT9hGJQB9iirVtXT+PCpU0xuSG6AIaWxL80sqwxVK7a1jn2hFe0LRjAhOsV8PMxK7qVhtKLPInBOr7y+3ML+O0Ah0QV1Uf0YDvsnw4puHQ+ZJr5GShhIwFJiQ3yj3UAxM14+oFaBUKYjRbXSnY0sFeTQ2B2yXI9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=dkF0ibjbzFXMbQOWReGGngnmbacMZRHwUWG3pgIY8Ks=; b=QlJIgMq5rHrRpEW7WxkbbBZMuduZkcp0E8lwa+OLbAtrLtOSg4yvPm1fGxk7pHwCDcVm3xgsXdwzRq27xPGGXgiZZtAUeOJHZJLK8l9YSKJDVjWTpgTXnSegOQof4FPd/Df1bgTCud8Z9vMLiLFph8+LJWvpjNCgpsc15+IyIPKCbgAcrlNHQG10T4BR9lxbkAvRIxST0/NwJlM+1amsD7wdh97FnTdTi2zPni34lJPv4oRP2e6aZoh5r/76wtvqVmgIrKs0Sls26UzUnhv9nymwMvoTB8o/0bBbgQyoVayT6AYR9YBLOPj/lLfwB02F3brF0wGLrDE6jvdK5LC46Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.74) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dkF0ibjbzFXMbQOWReGGngnmbacMZRHwUWG3pgIY8Ks=; b=E/Jic5zmplHXGtytJ0PrG4YbQTOz3UQEVOerBhxHuIcUvq2zeb3LMF3Sm3Ya+VlOq40wvLOR58j0HX/Xjn0smblCnpVUHVeAXm9zlyM5gOAyQ5m1sfwfVyMhbgnUZabM9mU60fMGAOYFtweYVbYxuPsjAD1SyHPlpIq/WUGcOpSZn6w4eLtz/SE/AD7xsB4/73zUnpTL0hlsClLe/Uz7iphHQJVz1REDG9Bw9mgTGBYzYVXzOI78rwwRlJbl5YHDa/YN7f9kLQjtbCkaV6wzpcEHImH5zNpalwEEXCxyb/P6lww7vYIjipRZPK0p6w83CXzae2piEGCzHAFpTiO7Hw== Received: from DB3PR08CA0030.eurprd08.prod.outlook.com (2603:10a6:8::43) by AS8PR10MB6972.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:5a0::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.13; Fri, 23 Dec 2022 08:55:53 +0000 Received: from DB5EUR01FT095.eop-EUR01.prod.protection.outlook.com (2603:10a6:8:0:cafe::51) by DB3PR08CA0030.outlook.office365.com (2603:10a6:8::43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.13 via Frontend Transport; Fri, 23 Dec 2022 08:55:53 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.74) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.74 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.74; helo=hybrid.siemens.com; pr=C Received: from hybrid.siemens.com (194.138.21.74) by DB5EUR01FT095.mail.protection.outlook.com (10.152.5.201) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.10 via Frontend Transport; Fri, 23 Dec 2022 08:55:53 +0000 Received: from DEMCHDC8WBA.ad011.siemens.net (139.25.226.105) by DEMCHDC8VQA.ad011.siemens.net (194.138.21.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.20; Fri, 23 Dec 2022 09:55:52 +0100 Received: from localhost.localdomain (167.87.23.195) by DEMCHDC8WBA.ad011.siemens.net (139.25.226.105) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.20; Fri, 23 Dec 2022 09:55:52 +0100 From: Henning Schild To: CC: Henning Schild Subject: [PATCH v7 5/6] meta-isar: install expand-on-first-boot in most images and add space Date: Fri, 23 Dec 2022 09:55:28 +0100 Message-ID: <20221223085529.8835-6-henning.schild@siemens.com> X-Mailer: git-send-email 2.38.2 In-Reply-To: <20221223085529.8835-1-henning.schild@siemens.com> References: <20221223085529.8835-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: henning.schild@siemens.com X-Originating-IP: [167.87.23.195] X-ClientProxiedBy: DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) To DEMCHDC8WBA.ad011.siemens.net (139.25.226.105) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB5EUR01FT095:EE_|AS8PR10MB6972:EE_ X-MS-Office365-Filtering-Correlation-Id: 12dc55b6-b69e-421e-56bd-08dae4c37f70 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: v3elklYnbdqu1TvnesFtudpssG+Ar+zDVNXntNdSNmEps8Mmplzu4X4G3NXjYTS8eJJAOfZv8O4aLBKbgXwuDRCPRgt5Dn+W3shUsPKh14gqsfJOMz5g6i5aBXt7AHgynGaB0d6wv1y5bxYOxWG39icHTNrgbbIpfz5PJJtUCLF6SYgxx+okTc8+qBlO/8tLfeo0VBHIdY28EFQMalW+UgdaNabE4ObqxpxwxxGEhvXzEEII0m5QUh11Akv9fWzExFaeqtVjwiXDRuOB6Lbio2uwyAmaJBDFIlWutiSnBSgAnkbYC1YN4RHMNhVKKVPeQr3RQqql3u1Af21C9uWrw7UeACRyJF0F3xubqMa4i5adygham2mYogPTkc3CtET9tNGVo8H4ux0lxGR7WxK3GFawXJpFslukURB7m+8ldJuHfJU59qzJRxusBd64FaewjWdhfFKl6jDxwo9FlWVDOwMz9V/n7M5sC3Qek0HcdBQgwosrClfxZ/0Eo0Ml1y/fP7zssUE5t2DacZOhiKjzGZxtCkzRG7cysdgRW7IV3JDmn/GMm8Yb0f++b41PDu3Jr8SmyKj3ji4KbIH4ItdXh8mhUV/dh8i7BdsaCV/9QM+TEAMabm9XiP12L/9+6Ss2MNdAa8E1MjBGP/oHF19Wg4slXyk2RY1dXEknj4LqyxxybS2LGp4OWAFIsYuXc/Zi/Kchx1dkkuYWjJ/zi3FDJg== X-Forefront-Antispam-Report: CIP:194.138.21.74;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:hybrid.siemens.com;CAT:NONE;SFS:(13230022)(4636009)(136003)(39860400002)(396003)(346002)(376002)(451199015)(46966006)(36840700001)(40470700004)(36860700001)(82960400001)(82740400003)(8936002)(82310400005)(70586007)(70206006)(5660300002)(4326008)(8676002)(7636003)(7596003)(41300700001)(478600001)(40460700003)(36756003)(47076005)(6916009)(316002)(2906002)(356005)(44832011)(186003)(26005)(16526019)(86362001)(1076003)(2616005)(956004)(336012)(40480700001)(6666004)(107886003);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Dec 2022 08:55:53.3389 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 12dc55b6-b69e-421e-56bd-08dae4c37f70 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.74];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT095.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR10MB6972 X-TUID: VEK+issKdYDN 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.38.2