From patchwork Fri Dec 23 08:55:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 2358 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 23 Dec 2022 09:55:51 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f60.google.com (mail-wm1-f60.google.com [209.85.128.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 2BN8to5M013990 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 23 Dec 2022 09:55:50 +0100 Received: by mail-wm1-f60.google.com with SMTP id x10-20020a05600c420a00b003cfa33f2e7csf1953703wmh.2; Fri, 23 Dec 2022 00:55:50 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1671785745; cv=pass; d=google.com; s=arc-20160816; b=r8ZKy2dKbCfRBjT9Afpyk02Rmff8ZdSNeYEodxj6H6lxiENDaNpyqOVRM2w73aUkJ1 u1D7WcEza3F3LB+577EAhecpKAJSMRi0Rr0JguwL65ZYOxh0dT8tiaw3qK7JSaWC0MCW pCs/07P3tyaWWSyqyYO74xuSyHdjN3qQQ7Eu9isfAxbbUYKWFeb5fh7y4z+gpkMltiGJ DQeVrVpW3dNQHmujypGN/+ogEWk/yZXvcBkEkmFxkqVn5lwA9tLlubYTPFRX7FDIVLKp SSVYrRldPLGkP3mkhFSkePLUzPmGSK9hUqdWqtCT+JjEl+IBNLhIQMwkCrIDU1QkpbAb mJGg== ARC-Message-Signature: i=3; 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=P+xpX50H7mtJ8cfoIgOQoVagJwqpfNjf8+i2T7rhr/s=; b=IqQT1jlk3wERKTU0dhoOOWKb+Crjt/cCsRn8LhUjyXiUC2P6ENQdD0i35dwNQtBGUf CGRjdTkKHbJHh4ynTqnA6NAmBVKegQlxyDTz3643Oe6Nxob6XhD/N1Mo8xdWNfnAHQWh I/293+1P1sH7NKNG75OQ91hkDMYmx4/kwGSd8D/zO8vWgJleZZCurYDmjD6ckqqhcavz A5GcTb8BRN1UdYEsDY0xrSu+GDjow7F0LfFSr6aMFmstm450VeCXPzkkMaIOvieDB5uQ WOZ1ol+VApAKikqzHsepXrOGBs9GXBNnvEyGiDfaWm0zJLl5hpDAkVOJwDoSqfVLqgOZ IQ2Q== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=xXOlu7oC; 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.103.70 as permitted sender) smtp.mailfrom=henning.schild@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:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=P+xpX50H7mtJ8cfoIgOQoVagJwqpfNjf8+i2T7rhr/s=; b=V+egfsB99+yZkJthFCBnPxfdizAxonDeT6SiUUFz99/4SvVrTqAIf6ptbVWTeP2pge ZH6kmbMIPOhVwpnCmGHiYVDi69NiPlJbrGbd87k96oIKhpDfCWZ9IZxPPXS2FRlfAWuB fUdrwkQ9GZDf23VxW0P8Z6yZHJ56FV15ngWRD3CasZqEC+8UH9CqYr8INMRR+IKeNCBi vJtDcuy+sA7LUhy8wwK/Em4noGw/e9k2AP9N7gT8hX/m/DY+kHo+3V6xCvBcXoen4ryK lJmuYPBE8njrPq2mcFdkQZh7J5bEh4y4dUNuP0GrNs75OqSIk5VTgxT0kLzOxWZP1zbo AL6Q== 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: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=P+xpX50H7mtJ8cfoIgOQoVagJwqpfNjf8+i2T7rhr/s=; b=5fxU/i1otnN8GlsYeF7ftefIBp9iugBh/ngXtdGQvIErVXtDYUxJIY+gstotsSjxBb wgwYJ9gtarJi7CngabgdKRLrWoEn8H2/ju9Tu5Zme2a89J291xXMm8D5ver6qtgYj3ih QbjZDAAvfdfdOJVoygwOMGKn5wmErW+nJcLhdAudrhHWDMFYltIiFz0QP/8ycNN3x91n j9AJ35Lg4GKP7ZeigZMoO0biflerrtz4US4O3xgiRGpPv8/WIASQPaWzV+/DLTKhE370 i8cqC5WU1mQUeNk0GlwlNgMNSR2pi0sh5FJYbL1ypaSn+ajJLyEF+b1r/CPrrHA3/xOl eb1A== Sender: isar-users@googlegroups.com X-Gm-Message-State: AFqh2koztnN7J+HN7gtvGV2HENg3/SGn4VnBzbjfPdrGjhCRlE8vkvxV i75ZfC4+kg0iX7r9+vzkh0A= X-Google-Smtp-Source: AMrXdXtfSaEFlDlk0NZUqt7gNhVhacHBsN9nJCN0lMli3JpienEDyKPHJ3fGMJloEccTLCtOeJSB7Q== X-Received: by 2002:a05:600c:502c:b0:3cf:e0ef:1f69 with SMTP id n44-20020a05600c502c00b003cfe0ef1f69mr390978wmr.163.1671785745452; Fri, 23 Dec 2022 00:55:45 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:3d89:b0:3d1:be63:3b63 with SMTP id bi9-20020a05600c3d8900b003d1be633b63ls3872408wmb.1.-pod-canary-gmail; Fri, 23 Dec 2022 00:55:44 -0800 (PST) X-Received: by 2002:a05:600c:1c21:b0:3d2:2043:9cb7 with SMTP id j33-20020a05600c1c2100b003d220439cb7mr6258594wms.5.1671785744474; Fri, 23 Dec 2022 00:55:44 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1671785744; cv=pass; d=google.com; s=arc-20160816; b=q8M/1Pn3XruANCocmbAHXfrcUgiZbRxNg1U5tn0O3NiYN948rRnoGNbmC560IlGzQC de2VVderVIOovfjs5L3rPN/E2YJmqAPd0lgSBCP1duHo4umKAp0vwlc8DJ4tA5fE/L7x ThG3qiXwRfl98cgGxb/S5VN5qbIb9ch3h558Wz02Zlh04BsgpXhbcV04JfXclJY4Ks5x kJ09hl9AD+8c4MaZuEnHO5cJVvcpLgs6ayUr4duYw4ghP/e4dapEVcJAE8UEuA95TyUf NUOxIbX6D9DKg4cF7cEtCEjBjpe7g30Wzi33dPVYYRHcExv+o0E7L2W2syl+CJqkIQfF XYgA== 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=h6UT5Qxl5Km1VheRcU6XjDJbEabvGN0JWHE8bbZQ4dg=; b=EpXCUxSKIJJuKE7Isr8aiVJT84DgLVeMZPDkSDJ4qdfSJ7pOIDfDZraPx7F/horcY0 83VAPoqzQo9jeLDNgnIBO0dseMShMdj1o8Plkwozu0oePr5Qmneo0BbPGuEB5xc5jtdY 0Q+LJWOB2wQzVJqKMuhxtqGxU5Q4VgFHdVyoJNdAZyGJXIVIw0EEt9Oxj9dCG5qJU3KG 534NMiVDTsWrL8XTIl5Yu59vONZRJ5Qmk9jlY8k4Km7L83zzMpQQUEHF0XSFOaY3BBvM P4wU+12KO7qtLqA6Hq2Z1q+RA61f6N+c2GuVqGz58LGi+NOAJl7jxfPi3n/9XNxopNd8 1WVA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=xXOlu7oC; 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.103.70 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR03-VI1-obe.outbound.protection.outlook.com (mail-vi1eur03on2070.outbound.protection.outlook.com. [40.107.103.70]) by gmr-mx.google.com with ESMTPS id p41-20020a05600c1da900b003c9a5e8adc5si387801wms.1.2022.12.23.00.55.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Dec 2022 00:55:44 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.103.70 as permitted sender) client-ip=40.107.103.70; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FnFNPtBBcca5wwVP9QAJ6CF03KtMHa4IJnr2CTYAo2y4Q0jYMZtXoM7T6UTILhpQhSn0px5Z7/4MIcqAXfWxRdf2MPGPBM6ADU1lvLcRHHDzxtN0tgYjJJHHq1xyC59vVO5EX799JyFoQw9UBUZ70QJkGTL+9nz3s90tVEba3VypePumB+NTrCz8QPoUSz2ExgUKOyhc1IWmyP/SyfUVSqgND/2JgrnuNVX94zo72Mz8fI2FMZ92h+apTSquAvXaXBzqnkuFVcmBWtHROryPMnCDxePY1GTdiZGSNHN0TdwKejnr2jLpiByTEQTzYO2xHSyxI0Tv44WDHTnc3YFk2A== 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=h6UT5Qxl5Km1VheRcU6XjDJbEabvGN0JWHE8bbZQ4dg=; b=jCZ6HzvnmHtdcFO2JFtHmg9yaJzF+NQGC2o8ZpuaBWB+4uG2y05wtYAqFqzwBoYtfv0cpK0dDZWCV6bV7IkJrmQm124A7oCHUoWBZJ7VcKj8YwFX23Slp+TUw3cQ6hlFd2ub+2JWbivgfqveKw2CB/u7TeXpwcYhCH/BXM2xEn2EM98BXghxK5QrfBPzTBW+7tVOe5r9gqdJPK9WaULivXk5Ja2xrgR8Z5oVnocAF5zsoVchuaalcNh6C/V7MhQmV2OjEPC/+Uqjd/+zqvi0O+DsQzg63zKz87FU226EWBZfGhHQSyMlCow79fIntuYUwuz8qE8oVnsrrSVGyA8LJQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.75) 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 Received: from DB6PR0601CA0017.eurprd06.prod.outlook.com (2603:10a6:4:7b::27) by DB8PR10MB3580.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:138::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.6; Fri, 23 Dec 2022 08:55:43 +0000 Received: from DB5EUR01FT065.eop-EUR01.prod.protection.outlook.com (2603:10a6:4:7b:cafe::2) by DB6PR0601CA0017.outlook.office365.com (2603:10a6:4:7b::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.12 via Frontend Transport; Fri, 23 Dec 2022 08:55:43 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.75) 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.75 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.75; helo=hybrid.siemens.com; pr=C Received: from hybrid.siemens.com (194.138.21.75) by DB5EUR01FT065.mail.protection.outlook.com (10.152.5.66) 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:42 +0000 Received: from DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) by DEMCHDC8VRA.ad011.siemens.net (194.138.21.75) 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:42 +0100 Received: from localhost.localdomain (167.87.23.195) by DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) 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:41 +0100 From: Henning Schild To: CC: Henning Schild Subject: [PATCH v7 1/6] expand-on-first-boot: really only do that once, especially on failure Date: Fri, 23 Dec 2022 09:55:24 +0100 Message-ID: <20221223085529.8835-2-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 X-Originating-IP: [167.87.23.195] X-ClientProxiedBy: DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) To DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB5EUR01FT065:EE_|DB8PR10MB3580:EE_ X-MS-Office365-Filtering-Correlation-Id: 4a79e068-b124-4a8f-a9fc-08dae4c37925 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: L6Y2Gorb+Mok6nIn10HQiPtlKmJEr+09HFtujPl4M7RGKb88a4wgPOZFMl0AVgbhwMr4yrpxegUuy25l61kyec4VB/hXYBiUTPnkaVeddcVOPIWXbL6kAGuI8db+O41BGc2SzlgUz3vQ3vSTp6B6jHPqm6fqY7vFqRoqwv1yxC7Vl9YBX6+PY0pnnurGkK/CPJNiERRp5yFNzd9AOszi2Ge7632yVE5+OEDTVSMm4cars0xB4CfIzwsyFtIaM9bkqmhDFxrODsfF+T4YC6o52MMkZbd5+KOOklPyozbepG523oBpox0ns2ka07u2cBjTuKXWTxTAZ/OelzZzKsMmKECpZ/OVpQlpSysKWjwpKYDcduOeK49hkkxqcMp23crji5DDfX1pyhgou2ThorxtkGrV01qfBk+vm8xbiBM2YeP9A1jgHL/3klLdW6A2fj3ymt+TMfUlrKDFY3UsNOKWbzuG2XYiPtnCKwBtvqgVUkI34NbjN+oLHXeT7e85V6LfgYOEFgbusbr3WsrIYHjNjkv3Mh/R+dSlyKjXV373ufvVyV1ydoYtGHrKMA77p48dqepUk+zfervoLlMNkTAt5+tLIjUtdLp0m5wwaBlr0HpASETeucHaGbp/iUFJUwEVMik5xAbn6+TJOiLT3qJRWE/hWQuUFeI2qGa1QnfEF8v5ByKCi3A6FR9g8T439m6okoIFdqyvS3RRynh6haVVi3wYNgI2Jl1pH8MqyPWoms4= X-Forefront-Antispam-Report: CIP:194.138.21.75;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230022)(4636009)(346002)(39860400002)(136003)(396003)(376002)(451199015)(40470700004)(46966006)(36840700001)(40480700001)(86362001)(41300700001)(40460700003)(36756003)(47076005)(336012)(1076003)(70586007)(8676002)(83380400001)(4326008)(70206006)(5660300002)(44832011)(2616005)(956004)(8936002)(6916009)(6666004)(107886003)(478600001)(16526019)(26005)(316002)(186003)(81166007)(82960400001)(82740400003)(356005)(82310400005)(36860700001)(2906002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Dec 2022 08:55:42.7849 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4a79e068-b124-4a8f-a9fc-08dae4c37925 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.75];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT065.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR10MB3580 X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=xXOlu7oC; 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.103.70 as permitted sender) smtp.mailfrom=henning.schild@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?= We do hope the expand will work but we also know very well that it can fail. The script is written in a way that currently only supports one try. And not a retry if it failed in an earlier boot. So make sure to disable the service also on failure. Signed-off-by: Henning Schild --- .../expand-on-first-boot/files/expand-on-first-boot.service | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-support/expand-on-first-boot/files/expand-on-first-boot.service b/meta/recipes-support/expand-on-first-boot/files/expand-on-first-boot.service index fda50016e9fe..90c92a396b27 100644 --- a/meta/recipes-support/expand-on-first-boot/files/expand-on-first-boot.service +++ b/meta/recipes-support/expand-on-first-boot/files/expand-on-first-boot.service @@ -15,6 +15,7 @@ ConditionPathIsReadWrite=/etc Type=oneshot ExecStart=/usr/share/expand-on-first-boot/expand-last-partition.sh ExecStartPost=-/bin/systemctl disable expand-on-first-boot.service +ExecStopPost=-/bin/systemctl disable expand-on-first-boot.service [Install] WantedBy=sysinit.target From patchwork Fri Dec 23 08:55:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 2359 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 23 Dec 2022 09:55:51 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-ej1-f59.google.com (mail-ej1-f59.google.com [209.85.218.59]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 2BN8tpVx013993 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 23 Dec 2022 09:55:51 +0100 Received: by mail-ej1-f59.google.com with SMTP id nb4-20020a1709071c8400b007c18ba778e9sf3061097ejc.16; Fri, 23 Dec 2022 00:55:51 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1671785746; cv=pass; d=google.com; s=arc-20160816; b=dRnwieDkbymsWoAvRjgzX3+uF7me7nk4Eoy4zmTEm9E2BPU8/t76vjuTw+fkWIqQGI Mxfo+L6pZS2Ycl+2d3pSpIV9bcHjman8822h9hgkTx8qtlR40bJKXvAhI4U3c+G8ZdDu Ew+StRRrTd6Rgrqt3Pnh1wzlSlOZ+AtEovOYTdFwxawwH3QDerQBu6cOglliaYRpfHbM MYlr8CaD+0ZP1Lle3XvGf+CW95z7cqhTAM6SJ7Kf3hwkOkY5pheWmdKo/G2XSr6j1sWJ fJ3C0HeF5KEqKdCqzl1ZGELzPIEpnVBzz9d+SmUc38ToroptwVDIpWxOmFaUwv0Y5ai0 5K6Q== ARC-Message-Signature: i=3; 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=kpkhZMmKDJ4AWSl308ke9P/eHVGTITqacBUyj3N98iE=; b=UDRSx729DsTbbORCr6UL7glBTR1F1ZuTSCBUd9S5Tle2/V5CDQltAF6Q5hd4kVhx1W uF0/gt038JJ2pbUfZM5M3A+XUgVhSQpWoQkrDcHIsSEP0f99gvjFMKpyqdjUL0FvBDpf I3syyx1UpP7Ln0hOq8RUoh/hk/S7uoRX9vCt/sT5PW9rkE3cDFGzoThGvh8yYc9dQdGN CuJcnPmL61OZMJMdKhL6K/F6Wa/hVFqt8efaZSd4GZnLpwAMm6iGWJgxErjXidGRbA+n c0jZACObFO429aunkyYPpDoGqkmQGh3TiM9hCmI56fR58B6O3m6CQRxcl/vJwHqj4pd+ dIeQ== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=ihmokyR7; 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.74 as permitted sender) smtp.mailfrom=henning.schild@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:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=kpkhZMmKDJ4AWSl308ke9P/eHVGTITqacBUyj3N98iE=; b=a8ws6TizDGsd8RB58RTJ4MZKIdYEPW4M70obcZUz/Ngzsfczo1ItU3OX5qyOxdYf17 TcSeTdvlaO0fPJon+J/D2RzQVTH7x5X41L0MfeF2DWlBbRymAy3Yr/nYrNT643kjcx2Z Dw1/o4Z+CwOu+QMy1BRKV3dXw81dxmXRPW8yon1gPWXqDsm9Ga2tl6oCI+XGlGutcwcF gmUWF/mWcZEMA8X/p071T8jf/4GekV3ufrV2unkKJ9iNLO0veOhfPmiPzQIYi1nPnoep Ypsp6u5NybA6NkJzP3T3/dPu3wV8uFs5Jnui7xOh6h9oCoTbz6lTwQao+b7lXNwlyXDe y3xQ== 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: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=kpkhZMmKDJ4AWSl308ke9P/eHVGTITqacBUyj3N98iE=; b=YptmN3p8Pd296JNCcdbe3GmCVxGqr7xzDh7oyjY0R8Qw4O1cBon2NjZ+moVCr3CD1L EiQzV7O1vUiEdOvIQGEHGbNUBK2qu3qJnWgyIKuCS34lod1GRtLxhXmpBPXcOf2k+0C7 EepojA5WCFVBvA+h6lGcYaE38o6jqWRdhvdyMOPUcx/kxBT9bWqDA0zqImfuJWlNFhdv azcKsJp1fo5ie97uPuzpdGOwks3U3i1eNju7PrMfidV9JONXZLQ+me6S+q8flXCf8/ES Ni9a18opdR/lQ7XbGvYOKolgtbNnwoqYPwJXDxJx9CQoBEGfbDMZyFsxaXv23x74kzGw k12g== Sender: isar-users@googlegroups.com X-Gm-Message-State: AFqh2kpAuc2ydrimffc38rqBj9fcf7xPIMDv+yarylmVcZATFkJSdUYn bTp31M3IGPDjC2Y/C9UYKzc= X-Google-Smtp-Source: AMrXdXupuHFuImNe16lGHJIU33zRR+xBFhS+0OGPHSvHtOmn7CGbl6M0gNxwROg/LKLG17Uc8BuXRQ== X-Received: by 2002:a17:906:419:b0:847:3a31:92cc with SMTP id d25-20020a170906041900b008473a3192ccmr289830eja.210.1671785746011; Fri, 23 Dec 2022 00:55:46 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:2708:b0:46d:d0c2:969c with SMTP id y8-20020a056402270800b0046dd0c2969cls2694247edd.1.-pod-prod-gmail; Fri, 23 Dec 2022 00:55:45 -0800 (PST) X-Received: by 2002:aa7:dd13:0:b0:45c:937d:25c8 with SMTP id i19-20020aa7dd13000000b0045c937d25c8mr7541983edv.1.1671785745137; Fri, 23 Dec 2022 00:55:45 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1671785745; cv=pass; d=google.com; s=arc-20160816; b=L0XQ4TnI3NgGF8ySDCEQ6cHPD6m0UrHwyibyUu4XhXswFjHH37FpvyLKKwZ6owl8hO RnN6uH/RjnszIJgegWqgLkMPHz4xYDkK+NsnK6XyV6U/HPNEAmpQ/Bffr3ngpwAZfxbz +Dq4zvtI7Ehtln6ipXhVizZVKe9FaUntHQqekMIdGjg/T2pF3qIrayiQfMBWvUCorYXF oNKchzl+jzHR4ChFLCsxRHln3yc3qW3g6LzjtzE2xxOIz6WYKiUNF6KJLp2x5oZwYaRs mMOoV808QI1xaQwxB9q7GPSbBoKo60sWsA3yCEwuwtt6oTokvWbAhFhtI7C10oeeHTCw dXjQ== 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=/G+ZvzMuohpEkO1uyv5aPw9NsDQlHaSs8BCaJBI7R24=; b=Rr9E8L7HgeWmzq5Cs4x5rko1ZfuXyjnFH7KVRwWl9+j7L4lBmyo69UsKpfIz+Snfa0 IvknEIVmZBJJGnOlTVlbgBZLeeWD84OXvwBQL3Bxsu7Ibxl830RmccAc0itm+fCj/xT7 Phrwe61qtubkCURn+in1dmB104DesPswBQhn2SwbQv/kqRrZTTIiSXjtAltUkf7L//SQ Ikos7PgHpm5UQtW9CBQI8/z0AlzYphUz8gaskpcQjtmXsPpIAO1JY1kPPJ+Ev14aWxlw tw66jCaC29XwbcAJm08i9MbxAp3WLIi0S/uAj6pcUaS+EMCGXdMKYaf2wuzfmUXn+nER PuqA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=ihmokyR7; 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.74 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on2074.outbound.protection.outlook.com. [40.107.6.74]) by gmr-mx.google.com with ESMTPS id l23-20020aa7c3d7000000b0047014e8771fsi150807edr.3.2022.12.23.00.55.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Dec 2022 00:55:45 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.6.74 as permitted sender) client-ip=40.107.6.74; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bHe40w1Iy8y9Ou46jWIOUyayvehT+n1MJBsw8Bi9wMEmEdH1IhBOwRQKEGdvk/7RZuxkFM/ZBrWSjA2AlGrQu/L/Q2CheCw2X3CNm0XBHCUJmRLw7tkFHtTCMC8kLYSAuNQfzFMQJzuLExEbUC+UXegU8c+ODfTrRJv6ONVEAGqpZQYHTyniIwSsBWPF9Epjdzfe2vFid6U71jY3364bLAoyoRphi3/FTBOF4+iOhz9vyTlrUDvNuYHRIqgCxtYzAoUCDiVnLAWF7EBLjIMBa5kvCXWt9pg3PRU9B8lVbRnzVzeiERmo4CVnfDQsvmGEgyVBQ1mvx7vf/2ihSRFnlA== 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=/G+ZvzMuohpEkO1uyv5aPw9NsDQlHaSs8BCaJBI7R24=; b=ZUMVSJJwOtBScx8B1xrpunUs4iONmG2eeQdemCSRS4lalIzPnPfGcl248O0SrFnCy9OVwuRSrW/70oZ0NfDareCXTS9tIsZK+bmanYbbdv0P+OZ8yGUCjiee735zeYbnl/mf1l+TdDSo/fMiwN2wGdynfzxWBvUuB1AC5aoELiq6rMRlS5nl6YNuTLFzmYc0jjjCi468FDkyvQ2aCOXkevUYHkuo1C225FxxCWRR3eX5g6sjNO+HrgouN/FxiEux7KmK9Gp/ufRhR3tgXfmU0ufY4rfnqdsP/MKMGx2oeWKmh8LyXn6Ltr0STmUuMIsF9Key5rk+h4MQRoi9QzjpXw== 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 Received: from DB6PR07CA0068.eurprd07.prod.outlook.com (2603:10a6:6:2a::30) by VI1PR10MB7854.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:800:1c4::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.19; Fri, 23 Dec 2022 08:55:43 +0000 Received: from DB5EUR01FT080.eop-EUR01.prod.protection.outlook.com (2603:10a6:6:2a:cafe::20) by DB6PR07CA0068.outlook.office365.com (2603:10a6:6:2a::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.12 via Frontend Transport; Fri, 23 Dec 2022 08:55:43 +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 DB5EUR01FT080.mail.protection.outlook.com (10.152.5.234) 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:43 +0000 Received: from DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) 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:42 +0100 Received: from localhost.localdomain (167.87.23.195) by DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) 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:42 +0100 From: Henning Schild To: CC: Henning Schild , Joe MacDonald Subject: [PATCH v7 2/6] expand-on-first-boot: support resizing a btrfs Date: Fri, 23 Dec 2022 09:55:25 +0100 Message-ID: <20221223085529.8835-3-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 X-Originating-IP: [167.87.23.195] X-ClientProxiedBy: DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) To DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB5EUR01FT080:EE_|VI1PR10MB7854:EE_ X-MS-Office365-Filtering-Correlation-Id: e81a1e47-831a-4783-69c8-08dae4c3799a X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fZKgJlYXIJY37lRwf91mfkQmblCRdgnnA1SEJipkfxRRISRwGXmntVMgWUidFCivWMnkEBrWKeZZ+OMjVXANmCgQ9CvUyAV9A03Iec+0KrrsTkyx/1+J2OKvKmqv6NIH3rY6N8DMMbnV0YvEGCA4zO9fy97+gAMH5X8DEsiadz0Z0epIMA47XFh7sb7OYDsLLtsny1yQKN23vwR545q0fr3lK6F5Bx42YhQO0mLI8kILNAkFEAbvqD/jv8BAXKq8LOb3ZNY1kkKXovZUvYjPV4ZHSMOTltlhY33I6cLhYj973+PqOIpnM/ec0DobAZlHiz6UeB9zExZDkR4r63m/QQxZUxCMJOyK5mttsz+hGhbhBQRC+UTusgVHv2XoX3jQO4Q0905pEfRiADCKMKFX1nOOer0Vit+ayC0pZmQ+FZoa2U/dbj5dGksvgGMYTyaxOcj8zrcKJ5G79LhqSH7QOJ+6sDEZExnryXtM/ZYYxyM1SAP0YjH9B45fP2nJjLKfFJzs22477/QgUngjR7gaFeHlV1N9FI9uDeKos/FlWMP83qTNskdUu0+Hvvu0D8VMMElxAwB646Uv8eqAkwnWs4sGmPKKVnxOdLS+AYCm1zueeR0/pCm1Lcek00M4jZkyi9HlLBwBOVDRMMZ6pUBqF3CcZ6FMU0xeuGG7Dsc/9mzUbvQooQxH0MDGrfG/TBJiFETz1aju6JrLjCOL/CLYaz3uiWxWPACrImFd9XgSlNk= 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)(376002)(396003)(39860400002)(346002)(451199015)(40470700004)(46966006)(36840700001)(40480700001)(316002)(6916009)(36756003)(26005)(186003)(40460700003)(7636003)(47076005)(41300700001)(8936002)(82960400001)(356005)(7596003)(86362001)(5660300002)(83380400001)(44832011)(2616005)(1076003)(82740400003)(956004)(336012)(82310400005)(2906002)(36860700001)(16526019)(70206006)(70586007)(8676002)(4326008)(478600001)(54906003)(6666004)(17423001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Dec 2022 08:55:43.5511 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e81a1e47-831a-4783-69c8-08dae4c3799a 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: DB5EUR01FT080.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB7854 X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=ihmokyR7; 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.74 as permitted sender) smtp.mailfrom=henning.schild@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.8 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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?= This adds support for resizing btrfs filesystems if they are in that last partition. It also prepares for potentially other filesystems to come in the future by introducing a switch-case. The mounting logic is taken from the systemd-growfs patches we had to revert again. Some filesystems need to online for resizing, but in order to find the filesystem of a partition (without udev) mounting it and letting the kernel detect seems a good idea. Suggested-by: Joe MacDonald Signed-off-by: Henning Schild --- ...oot_1.3.bb => expand-on-first-boot_1.4.bb} | 0 .../files/expand-last-partition.sh | 31 ++++++++++++++++--- 2 files changed, 27 insertions(+), 4 deletions(-) rename meta/recipes-support/expand-on-first-boot/{expand-on-first-boot_1.3.bb => expand-on-first-boot_1.4.bb} (100%) diff --git a/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.3.bb b/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.4.bb similarity index 100% rename from meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.3.bb rename to meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.4.bb diff --git a/meta/recipes-support/expand-on-first-boot/files/expand-last-partition.sh b/meta/recipes-support/expand-on-first-boot/files/expand-last-partition.sh index 93eddda2a3b7..7d658864924b 100755 --- a/meta/recipes-support/expand-on-first-boot/files/expand-last-partition.sh +++ b/meta/recipes-support/expand-on-first-boot/files/expand-last-partition.sh @@ -62,8 +62,31 @@ if grep -q x-systemd.growfs /etc/fstab; then exit 0 fi -# Do not fail resize2fs if no mtab entry is found, e.g., -# when using systemd mount units. -export EXT2FS_NO_MTAB_OK=1 +# some filesystems need to be mounted i.e. btrfs, but mounting also helps +# detect the filesystem type without having to wait for udev +# mount $LAST_PART out of tree, so we won't conflict with other mounts +MOUNT_POINT=$(mktemp -d -p "" "$(basename "$0").XXXXXXXXXX") +mount "${LAST_PART}" "${MOUNT_POINT}" -resize2fs "${LAST_PART}" +ret=0 +# Determine the filesystem type and perform the appropriate resize function +FS_TYPE=$(findmnt -fno FSTYPE "${MOUNT_POINT}" ) +case ${FS_TYPE} in +ext*) + # Do not fail resize2fs if no mtab entry is found, e.g., + # when using systemd mount units. + export EXT2FS_NO_MTAB_OK=1 + resize2fs "${LAST_PART}" + ;; +btrfs) + btrfs filesystem resize max "${MOUNT_POINT}" + ;; +*) + echo "Unrecognized filesystem type ${FS_TYPE} - no resize performed" + ret=1 + ;; +esac + +umount "${MOUNT_POINT}" +rmdir "${MOUNT_POINT}" +exit $ret From patchwork Fri Dec 23 08:55:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 2362 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 23 Dec 2022 09:56:02 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f62.google.com (mail-lf1-f62.google.com [209.85.167.62]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 2BN8u1W9014053 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 23 Dec 2022 09:56:01 +0100 Received: by mail-lf1-f62.google.com with SMTP id w2-20020ac24422000000b004b567ec0ec1sf1798406lfl.15; Fri, 23 Dec 2022 00:56:01 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1671785755; cv=pass; d=google.com; s=arc-20160816; b=hOTJHOHGz3zFNEyzH2X8bTlo7O4kl8r8jlv7O7Wv3vFrzEA29hX7AYTI9d/i9BoNq2 dO+g8Q7Yl37cqHAm2NitOCpGaUItJR4g6JOviGPiKG8PdHV7r78gc0exOH8Es8rAYB62 70R53nkkRyuii+99tewq+fBqDFvyMXdtF2b0rFrr7YstazaGuWTtFjq8VpeSWWjiL2rW ADRHY5DVDagIMDOwxeH/k7hQIjZE1jvD+Tszc5EQT6lTeh/0g9Q0JibeEKIJbZuGHXhV oBaBBJ15n44vCfmbR6Pzj2P/ZW2pMYtNh7DlISdpUiFdw3BL5abxOFmSBIU7ecAtDN3R dxkg== ARC-Message-Signature: i=3; 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=Vz8lIduECVmITKXWrdcEXIIiUvLULV00dnnRxUjwBVQ=; b=boOCWRK24QROBUTy0vfn/CV04ho1cbvzSsotnUeevfuCLTnukIZx/rPmF99Nbf0pMD d7R93DVnYf/TlliINHPfvjJBGDdr0uwPynCg3LQzLbOTbDvWLJm8Q5qpjykemZv7ZLmB IjxDdJNJyghOzjIznHWkrwsMCFKQATnJZq0vltUgcVo1W7veIdE7hxhaRRug5VVdY5Kz MEAJ6hl4mT1Ufm+SHvjrgnrgNDqLo8x/FW5hWcX43M2MGP/rZr7JMB3RA1fPraw59MaA 97X9Wbf7nh7xwhSE+KxzOPOEBTlmHuCUqAVrxzCOChBKeg2gq2NxL9IAkMzr9M1Tz6V0 nd7w== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=xTCHljXp; 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.43 as permitted sender) smtp.mailfrom=henning.schild@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:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=Vz8lIduECVmITKXWrdcEXIIiUvLULV00dnnRxUjwBVQ=; b=i5poTPy1rwq+BXH9Nx/4gToN218Y1MbIXzcdoSFa3sPGkiZkLCZDZl6VyY4t88bUQb mKigcUMhUHZkifcJAtB/XRukb131Dy8qg3M+WhbtNt/Cym6eeuuNaFb67utEWi+QM8vJ 3w1V60kZob/siYVbM+U7hyTig/BSh42U5XGskVNoaDzEsvCS6+h6F8uawo/+gSEoaGIs amFh/A9bxk7k8FqGHL/QgEPu8598rMQHHmtl2DyiwLlqzeEY7oZQzjf4IN9cZPGqswzg pp22Oa3bEe6EQrZkFtN80TgUgfLoo2bZeJ5TOABCW9Byr7V/HcdwEB3L4Bym5L0JDwqD /PSw== 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: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=Vz8lIduECVmITKXWrdcEXIIiUvLULV00dnnRxUjwBVQ=; b=NJ8Oe9xCtZ8Ik3DnnK0IA7tbmUQzQ/bndZCdqxz5WKh1nsD+N+db1Y+Qcrdik4uozA zsKDX9SKunLNlox8X/qLXSahPnXedPgzELnQ/eNY2HvcYniaDbI0+GO5hYtiXMNqsGFP Pyj4bE+AdDDq8Xxgzb17RvxKeJTVroyAeTzMZEdnlesqF81fUZTqESwbJu28ec3d1vB3 HuT7qApCKM4+hXbe032ekDGIU6kedLonxrW0Zd5pOWiE0WgsawkVZPcx9M7wY0BOSrF1 PHRH3BtA+5QoydMD3cFUtzzMajNo2bJ1yotLSUdxZb5o2glcG7eNYiYN1yLUc17Jvyxp ouBg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AFqh2kr4auljk/l22OBuyQBOibfCUY78pOnE3ooVud93pfymwx/G8DNL TWteYmu9u4Dr1zHM8eTfycc= X-Google-Smtp-Source: AMrXdXvOXV/nDx76hvtX8mznk7j9xed07jDe8uKaNutgwQJAWv8doNHUxDtO8G1Kri73VP5orwphmg== X-Received: by 2002:a05:6512:3b22:b0:4b6:4c3e:c2fa with SMTP id f34-20020a0565123b2200b004b64c3ec2famr796380lfv.243.1671785755580; Fri, 23 Dec 2022 00:55:55 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:4e8a:0:b0:4c8:8384:83f3 with SMTP id o10-20020ac24e8a000000b004c8838483f3ls150096lfr.3.-pod-prod-gmail; Fri, 23 Dec 2022 00:55:54 -0800 (PST) X-Received: by 2002:a05:6512:340a:b0:4b5:6c00:429b with SMTP id i10-20020a056512340a00b004b56c00429bmr2720414lfr.26.1671785754449; 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=LaL/n7OuTuuc8VJR/rt9sJZ3zijADuOp/fHnwRLA5Vil7sIrcupPyMCvAwij0/Ob4r tgUPHhKiuHuIX3rS91vgfuUMpJkaZooeQmjKVwen0g9qx+oI5L/iWN3I5OhSZ3XqzX1z Ya9uMkZmFlsWaH9JRrsQjNxkXknmwmTUjUbeb3YuIeWO7qL+VWqzVZeM+PcNjrJmCZRP 0RhfITzS+oBHe116/3HioNxNH6xtxyIkTUPy6BhFX5Vj1MkwjQnvtbeb1/3JGJM3m5Wu u3HPD2qBDtJw5cV0PAEiAAjFjLfc0kuMqQ7rmYhfYXF4gL1WwgA27Q9UpUDQbTHZ20MQ 2Ftg== 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=pJIE8nQTtpq0XeFo03PsIgk2M/wywhSGk7WbcBG4ZCI=; b=gtWOLovflYi5HMLBdT6UbOrDaRQDr+TOMK0KKc0apqA/7WGEN74JciEEtRPhyl2bsA dtP6WGfQ1StXYew3XrzR2egVVGPQ1ILyfGuaArN3qZvf1gZVXnhRYhLDFFNnlqabjKm7 aECzrYS4EGdETSbgil7Z8Z+qPUj7APXw8SSdTkAjCydhKnQYpaGfaSrKP0o6tEI0Mf9R HPqiCbJAP24EVUd83qBO2bKdp2nTjuA0tzz4LyN6MzyIWi0obcLvwvJOGe3iLNclqWdw pgR6vL8AuIBSTGfh/mYLCoVyGCLIDmEMf1wwWCa2pAyxgdG6zzaudEjwChpW3UC2/Vgr /Qvg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=xTCHljXp; 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.43 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on2043.outbound.protection.outlook.com. [40.107.6.43]) by gmr-mx.google.com with ESMTPS id g2-20020a056512118200b0048b38f379d7si151846lfr.0.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.43 as permitted sender) client-ip=40.107.6.43; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fU3J/kG84EtqO/fDWApOgUr3uTpvjrYY6kOukc7q+v3MV4Ak6JtUhnhy1iHTsjQ9K3nrvs8iUSjuzCVrBvn7522fqbdNLdfquzkPQ0zuwJft9H7qN+42j31L8QwhGmMUmsNW2OPW3bnt6SGCZQKmOS/5Vya4TjNtAd8tkNv12xcTtkjn3564grXWEYtB4c0UZ1lYH4cCi/1vulhWX+oSrEAtcnkVbxGswHEo8vO3TDmlOekcfO0+fKQ7E+ZOzItk4nJXKpGOSPmhRneaojvj8iEwoDWJQ7QPlIBMZT9QT1lQXq2ovy4qzg+NFAWBMb5BaXJ27JiS2Uw17dxE/XAUrQ== 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=pJIE8nQTtpq0XeFo03PsIgk2M/wywhSGk7WbcBG4ZCI=; b=YfdhvU6HfVxPYlWOsLNHZFv5pi17J+3tP+z83A/TDB4bLGKFCM/T+svJES+yc5uo1cRy/I4HCqwU7CetKIKlgMRKc9cEB/bWnmTJthCSn2MS6+Wh+PSds25SyJkztYBB2OgZ1DkyDCCH5F93987Ro+i4sBFIV2J+fEdHrggvC+p3yjM4T7CxrN67DLmS1v0kN9MQCrIAjnbl07MdOYJsymUYwrxXG1RSMYlWwDRMdQyLSaFeCjy8I9CPnojrFTCTpWAaLUcT6CDMFdF1SeCLBFt/+0WqXb/a//nFdyYLausYFaZ5Lb1cCCw7trmr/cguhL1KCeCbVfcF++FfJOr4WA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.76) 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 Received: from DU2PR04CA0338.eurprd04.prod.outlook.com (2603:10a6:10:2b4::8) by AS1PR10MB5392.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:48d::20) 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:52 +0000 Received: from DB5EUR01FT028.eop-EUR01.prod.protection.outlook.com (2603:10a6:10:2b4:cafe::da) by DU2PR04CA0338.outlook.office365.com (2603:10a6:10:2b4::8) 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:52 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.76) 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.76 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.76; helo=hybrid.siemens.com; pr=C Received: from hybrid.siemens.com (194.138.21.76) by DB5EUR01FT028.mail.protection.outlook.com (10.152.4.237) 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:52 +0000 Received: from DEMCHDC8WBA.ad011.siemens.net (139.25.226.105) by DEMCHDC8VSA.ad011.siemens.net (194.138.21.76) 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:51 +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:51 +0100 From: Henning Schild To: CC: Henning Schild Subject: [PATCH v7 3/6] meta-isar: introduce an example to use btrfs Date: Fri, 23 Dec 2022 09:55:26 +0100 Message-ID: <20221223085529.8835-4-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 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: DB5EUR01FT028:EE_|AS1PR10MB5392:EE_ X-MS-Office365-Filtering-Correlation-Id: a46db4c3-618a-4446-185d-08dae4c37ed2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4cmROSscYuGh7gH1EjwQy66Gszdn1h4VtZq3ECdr1L9EHddu9zmwQ9G557uVMbwmp3CHOK8xqiXv9RK8XaLnimQ6tFzY16t4Y0a94YRiwHacsA8nyoUAa+waf1iOZZ8o+xB293gESN4WkUXOetyCWj5roIkn9RHzeSlZoXncoWA6DIdzkxgGBmi98cd97fUDNW8Fq9byv3gIP+rkjntwuqUmu+3ExKqSr8KUtCoVyg9cvOAp5ppnwJ8PCErPSieQKzdPnaaQLrLJoU0XW11pRreIQUHMvmKNao4+s320orFmjWBq6YhENM3xKIPW10QykYDDDfKaMWU3ZzRl2afSyT9e5+SQG5IPmoIXhIMkg5p+sZobD2fYuEHr6zDYF54n5YXbVHMnzZYOvavDKs2vgrOVsZBeBumqkFpZnnZeILQYTr22AMTqJs5j8j0g2xxyIZC5zI3QYrp2ROP0vXgWzDjr25BOwiGHdoaSz6kU3LV8awXj4/Anno+Xy1zLTH6VUzm9Zsv2A+77MFukjd88J38iarzR7Sj115z2MQPP9Axqn+xvZF+O6r3EqxIS1lOcNtViXuJY0/jKHNlj3HxOqexhdmu5QJZFG6NaniF+Y9DhCdMFPZToTg7NSznWw4TnWyykXoQRGNPpvj3ilfBh1JHppeMw/D8IppCDwFcdrhQaRjb8ytBkSyqosy58doq14siiXcoc1OHC8bKGFUpvyHb4+chLWLirC9SwDT3b4uUnvZqyK3XCusoYrWcGPtyj X-Forefront-Antispam-Report: CIP:194.138.21.76;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230022)(4636009)(396003)(136003)(376002)(39860400002)(346002)(451199015)(40470700004)(46966006)(36840700001)(40460700003)(44832011)(36756003)(6916009)(2906002)(316002)(82310400005)(1076003)(336012)(36860700001)(956004)(2616005)(47076005)(16526019)(478600001)(40480700001)(86362001)(82960400001)(81166007)(82740400003)(26005)(186003)(6666004)(107886003)(356005)(4326008)(8676002)(8936002)(41300700001)(70586007)(70206006)(5660300002)(17423001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Dec 2022 08:55:52.2951 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a46db4c3-618a-4446-185d-08dae4c37ed2 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.76];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT028.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS1PR10MB5392 X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=xTCHljXp; 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.43 as permitted sender) smtp.mailfrom=henning.schild@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?= Switch debian bullseye over to btrfs rootfs and also to btrfs in last partition to have a target where we test expand-on-first-boot for btrfs. Signed-off-by: Henning Schild --- meta-isar/conf/machine/qemuamd64.conf | 5 +++++ .../scripts/lib/wic/canned-wks/sdimage-efi-btrfs.wks | 9 +++++++++ 2 files changed, 14 insertions(+) create mode 100644 meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-btrfs.wks diff --git a/meta-isar/conf/machine/qemuamd64.conf b/meta-isar/conf/machine/qemuamd64.conf index eca2628c4ae5..6b40cb50702e 100644 --- a/meta-isar/conf/machine/qemuamd64.conf +++ b/meta-isar/conf/machine/qemuamd64.conf @@ -13,6 +13,11 @@ IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" WKS_FILE_ubuntu-focal ?= "sdimage-efi-sd" IMAGER_INSTALL_remove_ubuntu-focal = "${GRUB_BOOTLOADER_INSTALL}" +WKS_FILE_debian-bullseye ?= "sdimage-efi-btrfs" +IMAGER_INSTALL_remove_debian-bullseye = "${GRUB_BOOTLOADER_INSTALL}" +IMAGER_INSTALL_append_debian-bullseye = " ${SYSTEMD_BOOTLOADER_INSTALL} btrfs-progs" +IMAGE_PREINSTALL_append_debian-bullseye = " btrfs-progs" + IMAGE_INSTALL += "sshd-regen-keys" QEMU_ARCH ?= "x86_64" 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 new file mode 100644 index 000000000000..014ecca61f0c --- /dev/null +++ b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-btrfs.wks @@ -0,0 +1,9 @@ +# short-description: Create an EFI disk image without any swap and btrfs +# long-description: Creates a partitioned EFI disk image without any swap that +# the user can directly dd to boot media, where the last partition is btrfs. + +part /boot --source bootimg-efi-isar --sourceparams "loader=systemd-boot" --ondisk sda --label efi --part-type EF00 --align 1024 + +part / --source rootfs --ondisk sda --fstype btrfs --label platform --align 1024 --use-uuid --exclude-path boot/ + +bootloader --ptable gpt --timeout 3 --append "rootwait console=ttyS0,115200 console=tty0" From patchwork Fri Dec 23 08:55:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 2361 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 23 Dec 2022 09:56:01 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f187.google.com (mail-lj1-f187.google.com [209.85.208.187]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 2BN8u1Jj014054 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 23 Dec 2022 09:56:01 +0100 Received: by mail-lj1-f187.google.com with SMTP id bn17-20020a05651c179100b0027905fa8e48sf999429ljb.15; Fri, 23 Dec 2022 00:56:01 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1671785755; cv=pass; d=google.com; s=arc-20160816; b=AoO14ZW8CdLMC8XuP2v9O6MgGIRsko2iwSJ4mg8//7R7YBOvG/l1epQ3gqDJI/BLwE w4TCvciVWkf81FHAUMkC0AZG0m1C9pBtj3LkJLStPeFiAPjZ3pqhjoW7KsUGmEpeahZt wIChUZwqorKYX++ScWMi+OY8+K+9eU/YYm5NQ3X5Nw2MXzNXH53hpcGHLRPb/z4CkIkq 1YIJb9nrz/5t5JWdE9cHZGlUb7C3exNfuXQ3ArnFFuqlv/N2qpsaDDwQUEkMJvsVwND8 LtOcfJxvXxqBS5eIfuEW6lhy/Cjw2Np8MxbgQJbSUvg/fyAadf32BbAuJYMfPGg2C1EK Dw8w== ARC-Message-Signature: i=3; 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=jIE9beEQcp0DEOh6Amp/uIDlTjBqebVZ5wby1K1oCLk=; b=o+7mB4MH/Dg4OfGEMm4b0q0g5BuWbknIQLlRf9UX5Tnc7lwAM4J+G6tjzvdpyVTG9K mypVR5IXrG9SMfWLTDT/Y9gVUjXAQPlhi7fFGpetzju10PFyroHn599YP0TEgq90zAT2 wRoRA9hFQs1RiPPGGwr22j06/HPNW3uMcWGcXqhmoE3LUDQXTpYfKeGY0Q6wHFZhw9Wd N8FrcQWeGjKkQisHnAwHgOFxAhOlWE7kkNxO0YWQu2DRbt8Gv3a3QImLEW9He/0wivLK 2g3bT6qzxpPHeG7pjHJjKYXXH4Qma8ehg3BqJ3aaNLF8yjxUM3g148DzrPURsDZmt2Mf Dh9A== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=urIFu5rS; 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.14.72 as permitted sender) smtp.mailfrom=henning.schild@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:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=jIE9beEQcp0DEOh6Amp/uIDlTjBqebVZ5wby1K1oCLk=; b=rgv1yv/cs/cp+l71tBAhwCuNnEzKSOSu3JAa+fhsaGpmD6jsH1rvKFq/OTeuMIHfFA WTRdb6nDPZm22WD/E/5za9WqEY7Dbyc+796/2W3StA412qkYKYx4YwhWaKc78Eh9dhCj MwOp2k1+DNzr5stJ+KKq5D/JwVoHDZeTqIANmp7J48qEkBOdw7yeoiveuFQu11tj7h6h c0uL0q2C64WWB1XDhmsQt2HbSKUz78DbFTicIRez4CkZqCjV+CB5ifvhh3mKOF0qyKvh SZ4qdl+R37l4mNxD3s/7HUoRHvo0AjVgPrkPqHP7AW3XbX0GDhVQAxhkvkRve5IcFbca Ydng== 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: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=jIE9beEQcp0DEOh6Amp/uIDlTjBqebVZ5wby1K1oCLk=; b=W0uwsSTZ+B5bPbH3fGsBIvtNMzbp/z5OJo3zfjcVEDeBZPlXzthWlhQ4JvqaV7twqt 4ybcAlVIsASwinwKYpGHbIlF6eABGdCZwjFEMwmeH0nnR+OJ+TtjCEluKmovQKwPmehB ru9qfmk1ITMKeZExfUy50VNi3/zU95q+HIbYiu0ptpDP771GekEnTn1CrGVvw2svGdXM 4rtGLcgnd7LWmEiTR9Tlp9KcYjF9w0YzGUP6+fPLD81UIzhLUn5DcEDKq06B7ve+PzUZ iO1UFzqp1s2DqLlOXCD+M4kM4dl/MfkV8SQ/MXkIgp5+JyUqE4FeVF/76g6RJsFZbJrB RLow== Sender: isar-users@googlegroups.com X-Gm-Message-State: AFqh2kqxE2PctbSqUjIYarSKaPsfHnX0bxDAr6VcGe6eRYPOld7dK95c m1eqPqh07cVNu02tZMknEqk= X-Google-Smtp-Source: AMrXdXvihk3QUJ2Yii30yI7Yrw/hruUMaJq3EnPBhLT+GZBhnZYv3uDnzoHvg2ddGg/5yWQBG1ZG5Q== X-Received: by 2002:a05:6512:360f:b0:4c8:817c:ef6d with SMTP id f15-20020a056512360f00b004c8817cef6dmr540336lfs.183.1671785755603; Fri, 23 Dec 2022 00:55:55 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:5d5:b0:4a2:3951:eac8 with SMTP id o21-20020a05651205d500b004a23951eac8ls149800lfo.0.-pod-prod-gmail; Fri, 23 Dec 2022 00:55:54 -0800 (PST) X-Received: by 2002:a05:6512:3135:b0:4b6:fdbe:773d with SMTP id p21-20020a056512313500b004b6fdbe773dmr2569963lfd.43.1671785754660; 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=U4DLF7Mur1cvNTMD/RV34uZYmL0vRTtnLyOnuvIcFpP6PmhoByic5KKdVG6MpiQUxN 2zv2SH2GE+/Hnvp3Aa+r+fvTUgHh6iMBKwQSNjLOCSacBcjppllD2QCJfunuX1xk3hnV Lm/mMKPK3zCIb0pMbLE/zDy1+ywtvakrg4Hf3iyD36ko9ht1oM6Zp9o7oDehT7ujiK5t fIFnWzBVT6rmORLRpeF6R/nrYt7FzaXeptW/9zms9X5rMzBbq6MvHJmtRY4w1pWSCTlN 0EeUhr6VL34rP2eBjBrHYA+ALUUDO/PgzBeFtHxoLrc2uMe5Navl5hlc1JUCFIIxG4qy NYnw== 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=gz6N9da56jhnla7d9ZEJ0mbPloPmcCGJKrnb6LLiKUo=; b=FTuVbn6guwuzZj2WRW05pfiC8FbDipPjU52+2czkFzbacKkE1Gr3X68j5/S7HBdtPw mzM0WAkKw77/gSMfsEE74KvOaLO/go1heVAO3BCFbJBeU9DAm5a3h9OMhWuoYXmJD6zl 7wpaVdp02ZHqXcw2rasJuoeWyoaAUfizE9XPn7RV8SHI0Dy7iHvcadEWe1/9fLSIHCMs DIW/54d213XyoPGLkaqOjO+oiXUjzX6L/HuJguSAZV5ZKRAUgYOlhzilKq5b/+UKJSMv gO7g3zpomu/CsELNTwfJPsTWtcHDJAgWZLZAN9VDdIgVjtA99f+mKpO3vi4F3IhxileL Y9oQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=urIFu5rS; 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.14.72 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on2072.outbound.protection.outlook.com. [40.107.14.72]) by gmr-mx.google.com with ESMTPS id o10-20020ac24e8a000000b004b5337b9898si144800lfr.6.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.14.72 as permitted sender) client-ip=40.107.14.72; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JrvGP219Z3zp2JQKMdx+UhM5Ag9CPn6Ajk5ddPBP6mQGTsbZBmskFhLedpANLqlr41xo7JPwULrTI6kZUSFZgvSyELF+TX2+E6OOjyAU8GmMniunpDvPkRm21XvIsjKDW2VZZtV3w8RVKOA1jew1RgkXTvFyos5UaE7Qs2mxrM2LPSQpG20U0EIiyW7IVgD1W/QGXgIEgf9+ndSE3jI/MyBBX73PSoTlnGGzKxRDtvfCAiAH1Lyl05O5nk+RyI04sHdmCZ8KYlera+pi+E3RM/zJT0QDXPqr94zCHkapKQMuwvuZwg8VrGLu0fWMdAPdSkNJ+RS2FTuXuC/PPO4qbQ== 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=gz6N9da56jhnla7d9ZEJ0mbPloPmcCGJKrnb6LLiKUo=; b=eHYb4WpkR6TwTvnnO6r8dy/rwxgoqyOztuFP/T1pVTKJU2zVtM3qky+G/YPnVuMxDLHv/IXFJTiJ3gbZEB5fPb+BtNxefd2icPn6QPJmxHUd+FzKBfI8HY3t5Hx1F6VOniu9sMBOCCpMYR4XoldZkpck1TuhSeB//G3Jqc07uoFicbcKvpOO1vdzCv6/cqBDr/cUb582uBG6XxwjKFHMsTnm8DOsPKpCU8coA+OyD9Obc2NJuuQXeC1Pt3+7pJIk9I8BEFrGmBOuM7dY+OriQ+dFSEns2H6ztvJF6ft4NjZZ+wqi/y/rLEJc27A1jS7j8X91R9rqq/j5RL4nyD1SJA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.75) 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 Received: from DB3PR06CA0031.eurprd06.prod.outlook.com (2603:10a6:8:1::44) by AM7PR10MB3764.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:14d::15) 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 DB5EUR01FT096.eop-EUR01.prod.protection.outlook.com (2603:10a6:8:1:cafe::ae) by DB3PR06CA0031.outlook.office365.com (2603:10a6:8:1::44) 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.75) 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.75 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.75; helo=hybrid.siemens.com; pr=C Received: from hybrid.siemens.com (194.138.21.75) by DB5EUR01FT096.mail.protection.outlook.com (10.152.5.170) 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 DEMCHDC8VRA.ad011.siemens.net (194.138.21.75) 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:51 +0100 From: Henning Schild To: CC: Henning Schild Subject: [PATCH v7 4/6] CI: improve cibuilder readability Date: Fri, 23 Dec 2022 09:55:27 +0100 Message-ID: <20221223085529.8835-5-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 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: DB5EUR01FT096:EE_|AM7PR10MB3764:EE_ X-MS-Office365-Filtering-Correlation-Id: edb78c5a-d510-40fd-f3cd-08dae4c37f42 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /qUEL8rMqMPPp3TlBWZ+ZKfDIJyMeOdDuqN3Oc7XXxHzMmr3g9TFyI3T9lw3uGF6PrTrBWGnnp3ZHXSEp75TwcOjMWYHtEqxpwEmmq9z3MrPNIQMXRkJnWFpseWAIUVVm4+OChCfNrVBsgxZlsLkIzu2J4/dxJRSfmFgI5gpRDpFvQmXzMI9Ax8svxg4+Cx1deAJ3khg9stFdbyD4/OGjgXVOfE0jZIyPvtBjUxyG7lrX0ZEw7s6616pE5I+zGQNJjkVztj0PLF1QmzK9Eb15BiWr7/1R1qsItYX3xUYvj+ZzEPOVx7cX/D14Bg5QMXnqs/7N6YXTgerZuQrqw9IlDFOnNmw+nyRF3pnt9+59IEMSfe8b8D25S2Gb6wfT8E+3KoU83n3SFIkCXbNZI+oMIk8eRCmUd7yFoLat4qBQRXbDxPiwL7wZerWOYlxxMt906E1elVminUal5ZVoTmsw8GQnLDmRxPcDiGsXAHtPlHE/p24rdOsFYnSXEzWVsKOHEJnWGd4xeLIwPJ9riNYlelZl3VFLgJVp4NnPJT0F6xdL3taNy5sqTIH8HxWmEv9nTpGZd8W2sTLLqQFYZoos7WxJ08LtKiGZ5HSK7Ko5ZPJNSwB9XBoBIEGKltwZdCg9zQ5p4utSF08JOSgH4zpD0/11+4hrwbuwI1RzgwOnSXJMUJGGb6WWhGOXCHLWa8k1dKUY/1yeK2vNLTWUntvYQr4/8qbtaEKgW+qTsfXP7Q= X-Forefront-Antispam-Report: CIP:194.138.21.75;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230022)(4636009)(136003)(39860400002)(346002)(376002)(396003)(451199015)(40470700004)(46966006)(36840700001)(6916009)(316002)(40480700001)(81166007)(356005)(8936002)(70586007)(70206006)(4326008)(8676002)(41300700001)(36756003)(82740400003)(82960400001)(40460700003)(16526019)(82310400005)(186003)(26005)(86362001)(83380400001)(1076003)(956004)(336012)(2616005)(47076005)(478600001)(6666004)(107886003)(36860700001)(2906002)(44832011)(5660300002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Dec 2022 08:55:53.0415 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: edb78c5a-d510-40fd-f3cd-08dae4c37f42 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.75];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT096.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR10MB3764 X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=urIFu5rS; 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.14.72 as permitted sender) smtp.mailfrom=henning.schild@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?= What was called "servive_prompt" is not a prompt nor a service. Document what that is and rename the variable. Signed-off-by: Henning Schild --- testsuite/cibuilder.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index d5c83b222d50..07a9edc56d9c 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -229,7 +229,8 @@ class CIBuilder(Test): self.log.info('QEMU boot line: ' + str(cmdline)) login_prompt = b'isar login:' - service_prompt = b'Just an example' + # the printk of recipes-kernel/example-module + module_output = b'Just an example' timeout = time.time() + int(time_to_wait) @@ -263,7 +264,7 @@ class CIBuilder(Test): if os.path.exists(output_file) and os.path.getsize(output_file) > 0: with open(output_file, "rb") as f1: data = f1.read() - if service_prompt in data and login_prompt in data: + if module_output in data and login_prompt in data: return else: app_log.error(data.decode(errors='replace')) From patchwork Fri Dec 23 08:55:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 2360 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 23 Dec 2022 09:56:01 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f63.google.com (mail-wm1-f63.google.com [209.85.128.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 2BN8u0nq014050 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 23 Dec 2022 09:56:01 +0100 Received: by mail-wm1-f63.google.com with SMTP id bi19-20020a05600c3d9300b003cf9d6c4016sf3519934wmb.8; Fri, 23 Dec 2022 00:56:01 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1671785755; cv=pass; d=google.com; s=arc-20160816; b=NRcyqkh8mMbLHWCTc1XBSZxcctmw9qi9RtQJPYqINzi3kGCfw0qjkIt561LuBH4Po6 RNUB6afJdWChmjTqiamNTGfxH9V7CsoJEion6rtQlJ3O8TNf0nRYfLwfoMzoC9afzDEv Wab/VFPCwhYYHXA1MKWWYualTnrWoaHm5YNkGvxzP1RuwCxIdGTdC8Kw9idKGstCtQbh ZVbnEPHpCivYsc8O+0N3Tyuy28CEdyISkg7aykfH9YidFxNDDjbghpFU8t5ZBcq90BoB FQkSpeIg9bjWgnHKvOkILK17SLzkr2EMl0C53qW5/sLgUrvZBQuZDM8uN+LHY7St/ZBO e9Xg== ARC-Message-Signature: i=3; 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=XeUcLWMiH2zU/23dbl+e1vTtCAYr0SzwNeoqVXmwrLc=; b=CxZj0hmR1MCFvG/8F8S+Bbjtk18FX/L6R2bg6q2zF41FcLSuJTy3e0QYqF8oycPW1p L69kUwxR/ZkDWfNwqPm4h29K7f59YySvYA3DSndD7iwlSulvJrL8kaaL16lfWATQY3GB hDNDjyYflb9a98gWe6x0PKUvIVICk+wnmbGJNxm4k6CEDg7bHtLoqBfmReWABdJQetkY g7LGQoyImIyKXW1FC9GwPJIL2sqW9KHK/QIjw0Fk8vsHRqgUZhewC1xTCx/G2EP1r5p2 enPykyf3yC/oyYCEubdipLASaqx6PHyW1sd7JlUuQ08n1oy+ARAc4qCCbvNE+LbCL4JE DJgg== ARC-Authentication-Results: i=3; 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 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:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=XeUcLWMiH2zU/23dbl+e1vTtCAYr0SzwNeoqVXmwrLc=; b=IOLfqlpBWa2pfWiY343Vcgyzko1SHz7xkSfwd+RJQ2XxD8KTo3LSFqYum5w0Rv0hFF eGsQiyi/EmrECPH77lo/NxN/SebxJUYOjezLg0HNdfv1/LFk4BEwgVV0qn3tHfgoIu2J CirvUylAXZSOBuXtRJ8MNaEC4Fk8HDR5A21st209opTciWLEs7nKVJ4tH2hoLeFZERjp +OaPU7P5zKQQv82fgrm6+2fFLMDI4T0n+TEV6sNZ6gF4naBK4iQ4Qv5ZXljeFYgW/tsw 3okVlhCx0QZtp+kbxe4PQeIV9FdvY6MzFz2T+w+kHywUMMWoj8daCYMUL/qmDhATG/WQ ElJg== 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: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=XeUcLWMiH2zU/23dbl+e1vTtCAYr0SzwNeoqVXmwrLc=; b=HL2RZXFKv6QAtHdU6mv1yYcqp1IR0NBinXUGsEOa+4qdMkCKoCGLsUoO7I63y3q7iq 9zRV4V1ABXwHysgEfnv+AG6Qza/K8RwfcEm7ZQnSLjRs4cT8Td7Zykma0IGivyx1SJJh oU13PFxQdKB3acCEyzx9fGG3Angm/kFm6z6WOP01iRyz25TJg1bKV3G04EH/W5rKT/WI 7zYr9reFetx/GsQQCrURHRGS8b5ttxFf0VFGjOw52ZS4cfL4ljHmTuUjsyhnqve5EZ9i yDdLrHLihXQ3CNKIxYRrXZEHl5jsb6glGQIbBlZ3lED1s85+pbU6vT8LjYCkQ/Dr/opb CiHA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AFqh2krnpVwgE7PGEQJONDqmkhPzh3ZuTtrJrVjV67lFNtiIZLHQ9R5+ zIrJD49U2b/rI42x8+R65TQ= X-Google-Smtp-Source: AMrXdXuj6H7ikW/C9WaVUSCoUEPaDvQJTMiBtVcGM0+bfXNTSVNjZQBkjILfhOBt+QCEZTpzof4k1A== X-Received: by 2002:a05:600c:4e4e:b0:3d1:fe12:fe44 with SMTP id e14-20020a05600c4e4e00b003d1fe12fe44mr525703wmq.51.1671785755832; 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-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 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; 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 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 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-Original-Sender: henning.schild@siemens.com X-Original-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 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?= 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" From patchwork Fri Dec 23 08:55:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 2363 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 23 Dec 2022 09:56:13 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wr1-f60.google.com (mail-wr1-f60.google.com [209.85.221.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 2BN8uC75014103 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 23 Dec 2022 09:56:12 +0100 Received: by mail-wr1-f60.google.com with SMTP id s1-20020adfa281000000b00241f7467851sf880090wra.17; Fri, 23 Dec 2022 00:56:12 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1671785767; cv=pass; d=google.com; s=arc-20160816; b=rnATHZ0y/8jlB0jXYLDHBUylQxBdgmBcDzEuEQjQ9SPJarwLj2NlyVsl54DTT1yssF FetCgvo76ydlZ8RuCTrmyN1m0YvfubhM6t9WPWWlYCZvGLuWScSMTrh/nAhTIBm7x+sz MFha9lNyAeJKkYicyPqpCx/Cbl45ZOpuJqJOMdKsIW2NIV2m1YlitLbKATN+IjiFy0Nq doAYuSoVfHCzm2hANlxxnslvH3Gxjd8f9aCtkVDUqaUoNxsIUzzd6VaVp9I/0yTAK6aj uw0RpCUfreEz77KazWRr00p7yZE0HG54fwpcwrox+LOBPTiplki9Cj7UyhWTehOjBBMy EYOg== ARC-Message-Signature: i=3; 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=1J8USFQbwA9lhENTfbKWBMulvDQrbMrH3DzSAbXnpsc=; b=Jk+GOlpD7ZPim2wzwDTyf+j2lhNuQ9+69t/b1+L3ma3G7fjDlohpwXMD0hdpsyy6Mr S1Isjrj4ksbaZk5roXGIN0nSzh6mdKpCOgre0O7p29Q/71McI5Fq9NoIQGlXsX3H3r1U pcI44z6F9vPz19MKY4ukxSOp38bd+e3rQjOdVOQVC59GscCARhbRqC94azE9ANW7dK9T m8uBoPrfjxoeEvRopidSiDyUmFfUBTdJALyf0fi8PPtcFcpReotWVdvul4GkT3GSQp/3 FyAsutmbv+rQgPtM1E11plfl0C0XDq1CDAj3M6f6c64jqvQD+7sRa4phhzHukTXgmuNZ gmKg== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=Qe3hDNa9; 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.241.86 as permitted sender) smtp.mailfrom=henning.schild@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:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=1J8USFQbwA9lhENTfbKWBMulvDQrbMrH3DzSAbXnpsc=; b=hYa/qHVi0pWdaCLG0bsAeFByU3HyoslCRLUz0HajknoaUpOrrxa1eGPb+sgy5/TK9N M745pyrEs1U51JA+zm/vB2pQrQP7oZLKWlgSrd5mL3FtHOLlYS8kDCT0/ZAN2uZTKISK z8rtDKDs/3AcGEqaATSAk1ZtCpin7Lxpl4C3YuNg0qzUFNFfXELV0zytlD/KeqrXah8h k482s9Vv51XMLWqAnOYr1bVlHMcgnDNm0cZX4y04K9z9uBCMzUulaqClhL06FwlpDTQy vFH+L6zqoGSagH5JIjlyYnT564CpSlfKwJTyGm1TWE5FzGYyO2ey1yQw8gF98i/8AyyL ZPYQ== 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: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=1J8USFQbwA9lhENTfbKWBMulvDQrbMrH3DzSAbXnpsc=; b=T4fiUbxyfePJ3z29OXYmyQfvu12uWxjdGHz7+sAHeT6NmRVZchmBLygcRIbGFFg6sq 1ODIMqNaOnkEHNaSLWHhQ+UmctT9vIwvtAj8RsjovyuyKikW51fH+gWWx15YAIFAMT9d hjM3XKkD+CDb3Ltdil3EmwzURIWNzWN8EKTlFXgeRv4xWo56Yj4tLFgZJtTz2LLHjxha SF7jIfgXU32tpB0XsvN2mrLT37g1893hKuXQSsJpuYjH/RTDo0Wec53552YExUxoZtD4 mh0FjPpyl9v0iIYvdgYi8bCkkKEElA+eOra6ZrutDZt7RVANVTcUCDlxBtdCReLgQWhj Q1CQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AFqh2kqin1L4Hy0o7N+RefQQPLXu2MpQXO178xIg1X3S24VoENt3br3w LP1zZ0Cn81RFdqQeVI7voYc= X-Google-Smtp-Source: AMrXdXvRQuDgeu6us15mAjUC/gO1WHMEfkvwOvmfIKZrO/fAaHhMGmcnN/Haqu6Np8lWo62EXOYlOw== X-Received: by 2002:a5d:4dcf:0:b0:242:2e81:8a3f with SMTP id f15-20020a5d4dcf000000b002422e818a3fmr323795wru.137.1671785767387; Fri, 23 Dec 2022 00:56:07 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:3d89:b0:3d1:be63:3b63 with SMTP id bi9-20020a05600c3d8900b003d1be633b63ls3872870wmb.1.-pod-canary-gmail; Fri, 23 Dec 2022 00:56:06 -0800 (PST) X-Received: by 2002:a05:600c:d1:b0:3d3:4d21:704d with SMTP id u17-20020a05600c00d100b003d34d21704dmr6461973wmm.14.1671785766506; Fri, 23 Dec 2022 00:56:06 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1671785766; cv=pass; d=google.com; s=arc-20160816; b=fQTokJlFgkEwKKlD3cf+7usd645+A8OE6DgpSMcVjYLbljuxoW1j8kdq0QIJSsfpLb 6QkLHgHk6DE1sRERSg9TB/L9Kl1rxyU3WEQ4yT542YVpl/VcAeUoBRqHqmeva/2se5V1 pQcG4SsAx1iRpMXa7rY7Rplxej5XHP6wXMc8ZPGq1JlgAojoAwXi2UnPA+i9MCYXBPZr B9aVfhgyL+OHD6M42Js0ncafrQPuFf72Thr6tfXXrddKm1tuFOxRKVGA8Tu7GipSmHaL i6LiX12maa/LmlEwnGLg3Ng4T1hT8r8BdvW47MEeg5s/aaSfKyk8TA/ym5RwFOXOXMoP 1Y8w== 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=CN3btUMTGBkC/QsjGFq2pKnZfh7Dh9TRaHBqW6ouNWU=; b=XNpQ3szNWhyJKXhXwMwofjqBjyCcTth6EHDHdSPgRsXLK3rigRZfg+RgyEvKuEDl8U YtANK2ILaaOItztBT1JOOlQv8QrDnCZ+245cxEkrQ39u6Ts3GIJ/z6BlQAm3QvBzYi6g SKq3woCKIsCq8oqI4al6WLuKW8CWCzVA8pW+DJB0NMCf4n/ldeX+nGOfkO3yvkaelKm9 t/Q++HLPoO/vNyQRkJC6AFXGaUfNDr3BXEottBqL4sMRILkWGEj8NsBENq0nbwc5Dusu pXJt4Dd+M6xjlY3R48k+cNOPofbua2/lkOnQdOpu+kOa0062wTHLxH2s6u+q4Ltxmg1k 5BsA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=Qe3hDNa9; 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.241.86 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02on2086.outbound.protection.outlook.com. [40.107.241.86]) by gmr-mx.google.com with ESMTPS id z5-20020a1c4c05000000b003cf1536d24dsi187548wmf.0.2022.12.23.00.56.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Dec 2022 00:56:06 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.241.86 as permitted sender) client-ip=40.107.241.86; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lAByX/g+NIWphIYcR55xykGLulEdTq7eFIWeYs4OXC0u3RTu1fApLVTCS1jj7gIKQB93LPggP9fP64YL+kOnnFswlPrEDH28jMZj+LJ0N8nxJWR7aZLPzcBZcAbTzUCbUraGAiZtLcVMMrzNd+vtWCZ6dcWTQpwVT7BybLNC6FGnXVN2jG5IZxzLtfP4Zw5l91FDEr2WBKyFj77qCAMrN6642Q+nZ7lzcvqjUrmtW9mA0/O145t+0NKMjxPkoNbXtYm6F6fTVH2lBpDbxBhZ+EHXuUpNCVl8ELfcgg6IVpO1kocgicmIFIq8f5oKGka/mhRGWhCRO33L2AZx9VHTig== 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=CN3btUMTGBkC/QsjGFq2pKnZfh7Dh9TRaHBqW6ouNWU=; b=Or7TRhtEce1K++SYuosu3ZWa5Q/osU33cH4hEXuIlzcHW8RbqijVb+AzcrzfiaV4jel23y1jYeNZDhJk3fl8XkaJF+vH1hCLFXatF2T8sNIaNWJcWcNFDBJlrgepfFDXAB0jUuGvTylLwzW+a4NF+SGfEErmENHpLk9BcNz5jRuQI95pSm+4qLRMEYqb1ffo4ezMShq1v7d1gvVEUEodygEoSj0pkca5vJS3oGJNAnCwPYk+ticgqQzkAagbEliHF/zMDtVDGSaYJVB2AXl9HpgdUkNPGe3xK2VLro2WlgLLV/Q015P1UUkhGiCv3/GhD1k33d/4iFqra9HpqWmZhA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.76) 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 Received: from DUZPR01CA0020.eurprd01.prod.exchangelabs.com (2603:10a6:10:46b::16) by PAWPR10MB6805.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:335::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.16; Fri, 23 Dec 2022 08:56:05 +0000 Received: from DB5EUR01FT032.eop-EUR01.prod.protection.outlook.com (2603:10a6:10:46b:cafe::74) by DUZPR01CA0020.outlook.office365.com (2603:10a6:10:46b::16) 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:56:05 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.76) 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.76 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.76; helo=hybrid.siemens.com; pr=C Received: from hybrid.siemens.com (194.138.21.76) by DB5EUR01FT032.mail.protection.outlook.com (10.152.4.250) 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:56:04 +0000 Received: from DEMCHDC8WBA.ad011.siemens.net (139.25.226.105) by DEMCHDC8VSA.ad011.siemens.net (194.138.21.76) 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:56:04 +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:56:04 +0100 From: Henning Schild To: CC: Henning Schild Subject: [PATCH v7 6/6] CI: expect a message about filesystem resize vom expand script Date: Fri, 23 Dec 2022 09:55:29 +0100 Message-ID: <20221223085529.8835-7-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 X-Originating-IP: [167.87.23.195] X-ClientProxiedBy: DEMCHDC8WBA.ad011.siemens.net (139.25.226.105) To DEMCHDC8WBA.ad011.siemens.net (139.25.226.105) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB5EUR01FT032:EE_|PAWPR10MB6805:EE_ X-MS-Office365-Filtering-Correlation-Id: a4419e68-24f4-454e-47be-08dae4c3865c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7MXh4EZO6o54pS1tU3VtbYT6BIRfzBp26Tj5oEYmW9Oh1+9LWr/aT3LQ/W+0H9AqCmKrL5iMiNv6FXKWCrQEPIFGc5Lc3G600RwhA1Hwi6wHkMtdWVIubVF8BdNHqIlYHPPYxc/Nm/fFnCYEcJuJ0ySgVZsjQfJ2yAKMwhCUrC2Be35uJhWOsRB56ysvlDsYOdj63y8hXC3LJmAKQj48GJknpn1lKoOlmeNs/DI0ozERn3gWh8uoWHiCfYi2z5yjj4z3OwnjNs1noXkfcS3JMp3ihGdzXzv24jGcbr8B8vXOa+jjNqKH/NQrrPdzznsMFSQhZK4W130+kmabHVdGGNesTNLpzkBodo16O1EhyjeoXNPaB1EDhtGuGf69ezhhlUw2+RRjMnc+UV3vtmbPnEa+ysEoItioPmEq/1vfj/Vb1dX2tzf6o0to64d4UJfruQReXqzgBZXjOzhp7z4Jx3rtSQzjxcn7fs4GsyfEC9260Ndf5fKCD/comAXYsC8IvUcaKeGrQzIPMbXmsYgaKnLJN57PDDMpX0+8r0c7ZLWwLGls5ZhwyrSGCJLveHDkfcrdYv44LHwl2FuARL3JCj7abSM93/pb1c5CuMGAQIsLWan8QEYdpO/ozYmzBcDZ2y6aj1GBVNUwzkFQ+6nyq9ECEiZnyE/V8S1GIEZLEXBs3hxe5Wk9Enz4xCZoNPcZlg02z7GzPhJ3ThtzQctlvO1zs9wUCUS0kH+tY0FlB9Q= X-Forefront-Antispam-Report: CIP:194.138.21.76;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230022)(4636009)(39860400002)(396003)(346002)(376002)(136003)(451199015)(36840700001)(40470700004)(46966006)(956004)(336012)(2616005)(316002)(1076003)(16526019)(6916009)(478600001)(81166007)(356005)(40480700001)(40460700003)(36756003)(86362001)(26005)(47076005)(82310400005)(186003)(83380400001)(82960400001)(6666004)(70206006)(5660300002)(8676002)(82740400003)(41300700001)(107886003)(70586007)(36860700001)(8936002)(15650500001)(4326008)(2906002)(44832011)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Dec 2022 08:56:04.9671 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a4419e68-24f4-454e-47be-08dae4c3865c 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.76];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT032.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR10MB6805 X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=Qe3hDNa9; 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.241.86 as permitted sender) smtp.mailfrom=henning.schild@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?= We have added the expand-on-first-boot recipe and some space to grow to our example images. So now any image using wic should "expand" on its first boot. And the kernel actually leaves a message for us to read, at least on debian but not on ubuntu. Signed-off-by: Henning Schild --- testsuite/cibuilder.py | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index 07a9edc56d9c..09c6ab9e535f 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -231,6 +231,23 @@ class CIBuilder(Test): login_prompt = b'isar login:' # the printk of recipes-kernel/example-module module_output = b'Just an example' + resize_output = None + + bb_output = start_vm.get_bitbake_env(arch, distro).decode() + image_fstypes = start_vm.get_bitbake_var(bb_output, 'IMAGE_FSTYPES') + wks_file = start_vm.get_bitbake_var(bb_output, 'WKS_FILE') + # only the first type will be tested in start_vm.py + if image_fstypes.split()[0] == 'wic': + if wks_file: + bbdistro = start_vm.get_bitbake_var(bb_output, 'DISTRO') + # ubuntu is less verbose so we do not see the message + # /etc/sysctl.d/10-console-messages.conf + if bbdistro and "ubuntu" not in bbdistro: + if "sdimage-efi-sd" in wks_file: + # output we see when expand-on-first-boot runs on ext4 + resize_output = b'resized filesystem to' + if "sdimage-efi-btrfs" in wks_file: + resize_output = b': resize device ' timeout = time.time() + int(time_to_wait) @@ -265,8 +282,11 @@ class CIBuilder(Test): with open(output_file, "rb") as f1: data = f1.read() if module_output in data and login_prompt in data: - return - else: - app_log.error(data.decode(errors='replace')) + if resize_output: + if resize_output in data: + return + else: + return + app_log.error(data.decode(errors='replace')) self.fail('Log ' + output_file)