From patchwork Thu Dec 15 14:27:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 2321 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 15 Dec 2022 15:28:11 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wr1-f61.google.com (mail-wr1-f61.google.com [209.85.221.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 2BFESAdT011749 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Dec 2022 15:28:11 +0100 Received: by mail-wr1-f61.google.com with SMTP id x1-20020adfbb41000000b002426b33b618sf688033wrg.7; Thu, 15 Dec 2022 06:28:11 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1671114485; cv=pass; d=google.com; s=arc-20160816; b=NGCnYJBc40arPhlAQMQWT/2u2EqaX8McF4vMZmU95nd7nVuJgy9/eKiP4N3p+uCRm2 8lOnQp0JMuUl8CQFdDFNsdGjZwcfveaeFvO0wQXVzjwBRtir+CpbUUdRb8SlkeremBwX JwO3qxBM+7Q4mAx68EaQwgx+7aztPQsXd5uAr1U2vPNw/zYPIadXCsyANmMSuWiFFg8p ObmG8fYRKjNbQxQu/SsxGqPtXv31z2tlEpopkFtyjJGIOC3S0BVy1odHeWDc+YwAbICb c8dRYmGVr5oZ+NT4CYVVkjRvQSw9BOdHVT5eq/mbkjiJgsX+yNqP4rIBbkPWAxytYjRx beLQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:feedback-id:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=MQ8kqMSgyMSUTNIyJZ1u411E9g1rMZUawl23510KmbY=; b=02fx/2YJVRAAq6rNyFgfv1sKFa95iczi6jcKaD+1bciD0fFpVAUeunzASyoKWM23al 3gf43wlEnKreFItN8BfoW5CAquni1NM+459qJs8vNbhBOgV1SGo3FOivt6wZf7GySHH7 zP0DjhIgMPVt2cONWjFVvnjx59v3tJK3V14odrEqIJVtxVyYeBH3gg7wNoSfQr3chIcd 0jqR0cW+uXZKj/0eE8UUNe+4SMEotgvS+BEM90tDzgs/TjDtWeVoFw/4hrUBcv421ayQ /vfiu1QKC6bpv0UEimoMGeD9h+MlaTTQDpcGlXY0D/uawakeasrlPFBpfwW08inqdB8o CUBQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=mwdFIkQ1; spf=pass (google.com: domain of fm-52304-202212151428039d7c878347e9b553ca-jdzi3a@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-52304-202212151428039d7c878347e9b553ca-jdzI3a@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:feedback-id:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=MQ8kqMSgyMSUTNIyJZ1u411E9g1rMZUawl23510KmbY=; b=ZgBMUQEKYcFuuy+neqyjQv0bf4T0B3y2qbfDI+Km+jV00UKw/neEd2ECaDGRJvEVp7 JvNsLn/J25MnSVuYK/mBfarStHuyvVNQM5W/2refaejEyASFFx7rJKOpGNECCHrLGtus WDdBosVz4Xc50tnimir3KuoEKcnDm8CE2gNSGImzxVKFWpwK/IU89ljSCe7DRk7HTLOS ZFxf2Wk3nmXy+8vSdLWvi9IngN6sLS5LcniY3qS0cOkmxN1TZIPw4qSSBZRNZZyfPDzn wonMPzaZEDtqhw052dl3Z0JpG55h9hbA4I+9VmzvY8ZdnuliXLauEidKM9SpH4a6hgG5 pZ/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=MQ8kqMSgyMSUTNIyJZ1u411E9g1rMZUawl23510KmbY=; b=2oTzmehBUiy+bN9yFtpw3t6MCEAL/MwEnBXWduF9cIWFRSUy0NUc752lEciOIh5B45 tI+Teuv0mkGYi05Ypl4wFCMEMkjaQecb2DJiMDCHVebnNzDlbhF2nmehg6IG1z6/0TY2 mJPSalsvqsOfX2eGjCs5lW1dQklQsloFnyobpf7hKKHhBPvrCQR35vOBsHNrhpCyhbJy RRNqKTNuN6AaOYgVhSOvukL3629bt5K3jE0OJ4nD7qckZc/Wfhh1MSebTYm3wYsHc0+V IJlduzwpsHQHKoPkO5ycaESBI22RASk6c41b9cm3lxExdA3eAnSltrSd0djMSNJFTD3S w5ZQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AFqh2kqeOJYUPOXiXl8F4cGcFPCtuB9j2nb2wmvHny+4J3j6yzRoIXv0 Dkd1uSFIy9gIZGkEmaXibqU= X-Google-Smtp-Source: AMrXdXtt9uBsQJVFygs6JPuv65bSD6BnwEAGtr0V/nCHm+8t1j06tpdDOStlJK2H85SmqHimBGyGdw== X-Received: by 2002:a1c:4605:0:b0:3cf:4d14:5705 with SMTP id t5-20020a1c4605000000b003cf4d145705mr134317wma.35.1671114485401; Thu, 15 Dec 2022 06:28:05 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:3b9d:b0:3cf:72dc:df8 with SMTP id n29-20020a05600c3b9d00b003cf72dc0df8ls1489036wms.0.-pod-canary-gmail; Thu, 15 Dec 2022 06:28:04 -0800 (PST) X-Received: by 2002:a05:600c:4f05:b0:3cf:9d32:db67 with SMTP id l5-20020a05600c4f0500b003cf9d32db67mr22570462wmq.3.1671114484410; Thu, 15 Dec 2022 06:28:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671114484; cv=none; d=google.com; s=arc-20160816; b=SjYBmVDVn1JFfvT3iprNTpgT9nLHesPndEKCP2Nn/V6UN0w7Y3i9E+5TwrkI2pth5p EknPg7NodMSDMXYdbSfwRlilnIFMPw5qFyJ58UAhdcGoWev3iAWd0YxVB1qM3Ch3cLkd i/DctnA3zZ0xxIcUEGBBf8oo8gVNd9tv0Ss+P7+oDGE18GhxdKuFMCsk3E4hdUpo0DDe zU0Fk6uJNigzqxAJ5wiu6M+xQHdU0VUkhA/2znfmgv+KhreUxgMkTgHk40P2wWIALE9G RNJBH3K1Fl5avhXEfnv5/8J/lmQ2x+CVtWGetj9UN8J+kipYqnLBVMNEvFJWYDweWfxs XlLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=m5XMbJBaQ4aJozklzfEWtIu/E0TLDRr8GNzK41e0PFI=; b=WJhQMgFGWHerooO6qfDkKWLjd16pu09/zp549zacdtdQ5afTWRdMo8UmsuPms1+UWu zhHtKk2nqSsB6kz3sxG9nLvP2ztHYsDrMuzF17ZdgL8yRSXC7x5TSEJMgyM8/CirZNjy vis21ff5cwfEaSCe6DPpn8lIy+Fv9y5P6KB9nYUiiKnxm2cqfGZJUfuJsmDIJgQSZjGY 81EUstHHPb3jnBrhceTnNCIVbko6BTsAqiNaoO+4ltFGFlozZTWccS0HRtnEGYzvTVb6 3QMpQOA/X4i41meRssAGo4TG+1XtW5Eq9zfZYs9rwLiIny+wOq/vE4djsVB1zPUk0Vi4 nCvQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=mwdFIkQ1; spf=pass (google.com: domain of fm-52304-202212151428039d7c878347e9b553ca-jdzi3a@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-52304-202212151428039d7c878347e9b553ca-jdzI3a@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id v6-20020a1cf706000000b003cffb3cf5a0si278012wmh.2.2022.12.15.06.28.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Dec 2022 06:28:04 -0800 (PST) Received-SPF: pass (google.com: domain of fm-52304-202212151428039d7c878347e9b553ca-jdzi3a@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 202212151428039d7c878347e9b553ca for ; Thu, 15 Dec 2022 15:28:03 +0100 From: henning.schild@siemens.com To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH v5 1/6] expand-on-first-boot: really only do that once, especially on failure Date: Thu, 15 Dec 2022 15:27:54 +0100 Message-Id: <20221215142759.26327-2-henning.schild@siemens.com> In-Reply-To: <20221215142759.26327-1-henning.schild@siemens.com> References: <20221215142759.26327-1-henning.schild@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-52304:519-21489:flowmailer X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=mwdFIkQ1; spf=pass (google.com: domain of fm-52304-202212151428039d7c878347e9b553ca-jdzi3a@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-52304-202212151428039d7c878347e9b553ca-jdzI3a@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Henning Schild 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 Thu Dec 15 14:27:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 2323 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 15 Dec 2022 15:28:11 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-ej1-f58.google.com (mail-ej1-f58.google.com [209.85.218.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 2BFESBwq011761 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Dec 2022 15:28:11 +0100 Received: by mail-ej1-f58.google.com with SMTP id qf33-20020a1709077f2100b007c155ab74e9sf9693236ejc.18; Thu, 15 Dec 2022 06:28:11 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1671114485; cv=pass; d=google.com; s=arc-20160816; b=IiYG0OT+CoifJCTiY44tucB0jdWAgGS9meNqVeo5ORiZ6K7Hr42d8XZSiBYMbxdtaJ NuLFIwkiX1fdZKY/f0aBJQ6bcGrqYXTTvuPwF4P4fCZFlEVjwz5yfiGSkcXKGOyxqF5L RrHGD2Mf8T3ByY4BDBLpm+1QHg06gWBntQ9tzMjBTugE6g35mmMgX9gL+o2zBYgkUr8s 2cqg0VFjBDiGoFWmgHzre3aWto9p70V64kvPeW5n9ZbbxWh3wxCLi7H1Q0CVfCQ7zb0k RVrCI1+Y9lBivKId3UFSMIoqCTuQZ/jOX7M85TKgZf2bvCFJzstiS7wvIN5xqZRHgmqZ evTw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:feedback-id:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=9o7x7T6Bia8gdrvGSsGyQk55vb0c7aZVoNor7/m/djY=; b=qnrTN6GIkiJ6IoDiDZfoMpls0DuIY+uvwtxd7UZ+IuTivJYsuaOnChPb4eu74bMgql q4tQU9bVvOVQfpZBQfTB8Its1ZyYW8+0kd0f4T8QRzCMbbyUiu7r0d3Ry2eyK7+c02Dz fjVfRETUHzFPppHu1B99nGMpIJagk+eWOF2gdTb6E84nIH7VBPF/CpEJfdOU2oOSYFZ7 cPHzPMfg3k8M+Az0xHLXPZSNnqyCaZnccQ5qlZVNeuP6Chw/FHCU1498cLAaNJ44FGlL 9SckyeTJeortOFCYf0D/isur78AUi+NnJQYAxfBnkeFA/k+fLc6eLYtcxyJgq13yK1yv lxWw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=V+jkZMqS; spf=pass (google.com: domain of fm-52304-20221215142803665d1745c04eaccc5d-4t9cbq@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-52304-20221215142803665d1745c04eaccc5d-4t9cBQ@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:feedback-id:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=9o7x7T6Bia8gdrvGSsGyQk55vb0c7aZVoNor7/m/djY=; b=pGjv5H/ggDmnyonL76rQkKawIdGqy/oLa/R78P7HIeOCzV3X6cHYUp+zfItt0lBalt dChpQIB1sGveMCg786aeH7SLcb2dnwDF5sFSD1pDQr6ZN6nbpMpP0ZNZT4+XDx8jkOZ0 wso5xpq+wr5oOEf/+LAXrncPXZvKrKxxJSI9+S95PXWn904qnsKc+SlHo710+f0GCQDe r04UW3x1ydrbhyDJLMPtngMm+fIaeUKmVa/Ru17TQZZW+9EdFgGF6Etplch3/i4qBgUX yZ4JNFNuaw/EpcfKbq4g3dVhlCxgS+q4qhPUnJ43PHsbFi521SHz7VlkUaBYU0GXfEmx 7PiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=9o7x7T6Bia8gdrvGSsGyQk55vb0c7aZVoNor7/m/djY=; b=eLqTriGdvmFW7kc9TYVZ399IC3hJBv/aOtr6l7Yp0c1qstY7VeaU7WDfzQd8CE1xDs YBFGa/ciw9ZL5vyFBJ8QV/UAci1nGG9wf1Dnurs5pAMk8QbXkfpNpGzHOdKGSm3fx8yC uu1frQPGdP0jDKSCbEU1WGjoRZ645iOh+u0mQJFN8iCmEaAKYmgWZdWrX3G3MMTKywU/ PpYx2M+D+VZR9dDKQ00PztOkaDf1YwmbJ/e9mgK1t5w4d7C+VmbElVifNsN9BnCZZXQ/ R61Q1WxHrOS41hxZq1xE2QPLuvTC5i8DtN0OteKQWu7m9vdw2gvEvWAqgI69Sk4sn1p5 HoXQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: ANoB5plpYc+x2qvJpQK/mmgXZqDjBpsyYK/ZQKJGJFg8fOEv5VibzhXT jFF2BQnV2lCD3cO1JqDOcW0= X-Google-Smtp-Source: AA0mqf6e7QdvTI/GDGdkcwRFQMqv43GKpYnxSLkKcYmTcagl3hu1C8LKIHWKjv89mfi5Dgiwjt8jQg== X-Received: by 2002:aa7:da10:0:b0:46c:43ff:6961 with SMTP id r16-20020aa7da10000000b0046c43ff6961mr25220188eds.14.1671114485567; Thu, 15 Dec 2022 06:28:05 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:190a:b0:45c:bfd9:fb45 with SMTP id e10-20020a056402190a00b0045cbfd9fb45ls4791968edz.3.-pod-prod-gmail; Thu, 15 Dec 2022 06:28:04 -0800 (PST) X-Received: by 2002:aa7:cd78:0:b0:46c:be9f:7c3b with SMTP id ca24-20020aa7cd78000000b0046cbe9f7c3bmr23279397edb.19.1671114484562; Thu, 15 Dec 2022 06:28:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671114484; cv=none; d=google.com; s=arc-20160816; b=084GrTyNS/kIhcvUMGTDtcV/0tXqNZqXb3ECLW+O1tfNvhohW9RejkCnOi3mAabsUA Rm5izNDUJkqBaIypDhDEHprmAsz//ZmRhhz20l3ARS8OMtduYnz7T9jtCt6H2srSLIJn jr8d3+pICxgoILogD9710zcTivRRLuWjX6qbpANsVDlvj6oKYveaIs6XxwBUUNWJXgq/ RhcYkhQpE0NSN/5ZuGn9X1Kj8hDOmjLcAlrJGeE+Dq9FUa5dLtoHs0fTszcSqodZuv9H YR6shzfb/FDBz7eqdUZRjMOhP7xkZOM1g4YChu9a0qX3zOWVjjQNqgtLgy+0HMVEzIla 8nhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=Dbw68Ih8nBWlt1Bo2w0VuFeoSiSGlqoMVywCBr2+Am4=; b=c9ydJqxc1C6W1CiM3ph0dN4Dg07h3waY4AIoSefryRfvZTuDGikrs3GpyrB4Rru8Px qdpQ2zYSnuAj0TRQ0PKBVSkKHjDI5vDvMjDTANs1JwyaPc7NpVMRf3+GksqD87d2FAVK zINMfmztX+A0X5Tg0XI6gyGeEuIP2Qgfvw3cKEJJ1nDTim23iUri50YAXW4r1aTBsnuB +BlydOJzUBwtog/dOcFmLcI1cmTDNRUbQ/8svWCW5h5RqltFBWxv4El0SNS+FADPxSBS ySh8bAiAq2YTnt0TWBzNF4vNPVHQ6Y0UFStuX3zpKkYxM+WUUpEwXvic4bKzNNSSipiC P30Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=V+jkZMqS; spf=pass (google.com: domain of fm-52304-20221215142803665d1745c04eaccc5d-4t9cbq@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-52304-20221215142803665d1745c04eaccc5d-4t9cBQ@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id ba13-20020a0564021acd00b004704657766csi361090edb.1.2022.12.15.06.28.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Dec 2022 06:28:04 -0800 (PST) Received-SPF: pass (google.com: domain of fm-52304-20221215142803665d1745c04eaccc5d-4t9cbq@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 20221215142803665d1745c04eaccc5d for ; Thu, 15 Dec 2022 15:28:03 +0100 From: henning.schild@siemens.com To: isar-users@googlegroups.com Cc: Henning Schild , "Roberto A . Foglietta" , Joe MacDonald Subject: [PATCH v5 2/6] expand-on-first-boot: support resizing a btrfs Date: Thu, 15 Dec 2022 15:27:55 +0100 Message-Id: <20221215142759.26327-3-henning.schild@siemens.com> In-Reply-To: <20221215142759.26327-1-henning.schild@siemens.com> References: <20221215142759.26327-1-henning.schild@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-52304:519-21489:flowmailer X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=V+jkZMqS; spf=pass (google.com: domain of fm-52304-20221215142803665d1745c04eaccc5d-4t9cbq@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-52304-20221215142803665d1745c04eaccc5d-4t9cBQ@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.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?= From: Henning Schild 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: Roberto A. Foglietta 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 | 35 ++++++++++++++++--- 2 files changed, 31 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..753b8c33399c 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,35 @@ 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 --tmpdir "$(basename "$0").XXXXXXXXXX") +if [ ! -d "${MOUNT_POINT}" ]; then + echo "Cannot create temporary mount point ${MOUNT_POINT}." >&2 + exit 1 +fi +mount "${LAST_PART}" "${MOUNT_POINT}" + +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 -resize2fs "${LAST_PART}" +umount "${MOUNT_POINT}" +rmdir "${MOUNT_POINT}" +exit $ret From patchwork Thu Dec 15 14:27:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 2324 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 15 Dec 2022 15:28:12 +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 2BFESBJc011760 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Dec 2022 15:28:11 +0100 Received: by mail-wm1-f60.google.com with SMTP id f20-20020a7bc8d4000000b003d1cda5bd6fsf827048wml.9; Thu, 15 Dec 2022 06:28:11 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1671114485; cv=pass; d=google.com; s=arc-20160816; b=NsTlNra1k1SKO62yJ3gX0jT/G/H+c/Q7iEULQ2S5wfbtVnX1kPW7NzIB3bxLmlshbr 6Q1GcYwYOywjoTRtDpjX7bISFwg3xrP6ZVs5efWe4RW1cik3T9so59BPBBmmgk53GBfQ B1LhmRKO8vIRK70Rn6ncchra4q2GFB7l0Tsx3gjxGR4WagO8Cw864YciaTsU/UpZ7edI +f/PhKvivDjWnSQQtuEGf/V3uRyyuEX0goNH47uql+0FeAYAyfpsqZkVrGbnT1giSzRw bF+UE5cD5fnB3uWHlOE4+YwHkP/TChjidiAVlVZKKr3wU2r4uHPb+G6NwlK7Fikz58qs hF4A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:feedback-id:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=E6hq4LXvIcEUT0EwfjNgUrvomJoG3xotK+p3/lFdkPI=; b=Oeg1RLNrhoYOEIk7pmOTCmxR59wA9lSp7SK26t5SFhcogo0NR63IFF0F1rIYF3U04l uJw8K8+uv+iR7GJa/GAKHnchiaSfYgjRRWo+dp9uT9YoQv33S2EghK30kMsDBEdv7lBp Jcnbn1aIb7c7zMv9jWv5LSg1L25pWx20Ka3Xlb0slFD+x+sWx7CCSG4nTH8bAx/XrXE5 VIzciKhH7SlwXcTXWdoj3qLSaELr98ej87UIT2bKGNYLVRxCK3tG+Guru16k2m5WNUT5 +mWiLn/mQvVwyqin56h+ttvVlxrpXyOxODfgwZsjsA18/lpJwUg5+VHec3iDvqVx8W42 PHcw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=IGk+YQ7d; spf=pass (google.com: domain of fm-52304-20221215142804fee2cdbdc6fc2c6fcc-gieodb@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-52304-20221215142804fee2cdbdc6fc2c6fcc-gIEODB@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:feedback-id:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=E6hq4LXvIcEUT0EwfjNgUrvomJoG3xotK+p3/lFdkPI=; b=tiKCJIiSLJD5u7XTH4aD6o5FQ0DN+a4zb66JEBhUlb6/BHAkvbEBR22g3G7iK8JKY7 xPD6EPfnAz/GaSD/6GFkXoAukHZ9mY4K4+sUZOpsZ8Bjcw+wISMJjryTR/5SEwdCdyB0 QzlNiM4Nc4FYmoJG9pEFDUBQT7G64xiXV9zbtWoO1VpsDtP12yMux0FfPb7ly9t58mk9 tE4Q9e+lBNUWHIWHt5PgGqkhgDpqDhAmjgXBzS5cTyqEhmXNI2ITGCY+b95OnARRwJkR gHS2mvWVMNV0QZWFTcqaA+tHovowPCAOvP+vOIYa04evQUOJvFk3HpcMHKv1inFBVa03 TJ0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=E6hq4LXvIcEUT0EwfjNgUrvomJoG3xotK+p3/lFdkPI=; b=RzEV9dmupUTzpHA027a1cvVNru+05DLdiRGYRyDi5p/qJKzFHOCSmcurrH43tcc3yT gXhzo7GhQe1rQyWgCSm2H8hgViRk0dZqKbwbpsnIxCnCDE/w0P3a1kMXyDtVCn8sPMvC fkK46CdsGMrRVEs46MFMsq6sZQ/aD2/OWkX2GyrxNPH1La8g/7TYwU9u7Iwf8qeFtm+V nWhm7Ay1d796Cx4JNivN8/7gJvNftvOuQNLn3TPa3lD297h/6WHTfpyht9CsUFsaR6Z0 wEdoMRLa68Pl9eAR+h41CoY1iG4gqgQq9nAs4H2qGCa7QF0VBvyBvkeuqOLwt+hft0VP 7pSg== Sender: isar-users@googlegroups.com X-Gm-Message-State: ANoB5pnfs7Fd/HXyzDMcXOSZGRlIKoNw+XsuIyyV5jH0UEmdSn5REk8s 0Jht0uJ6xdTZUoGs3Ow1iIs= X-Google-Smtp-Source: AA0mqf5I2uOMxk+lx1w1XOctT4UKO5DrwjqiHuEORrj8pHRa2tSUW788nQ34XgKZriaSUvuQRnxqSg== X-Received: by 2002:adf:ec83:0:b0:242:580f:3eb4 with SMTP id z3-20020adfec83000000b00242580f3eb4mr14129965wrn.450.1671114485486; Thu, 15 Dec 2022 06:28:05 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:5120:b0:3cf:9be3:73dd with SMTP id o32-20020a05600c512000b003cf9be373ddls1465437wms.3.-pod-canary-gmail; Thu, 15 Dec 2022 06:28:04 -0800 (PST) X-Received: by 2002:a1c:3802:0:b0:3d2:2043:9cbf with SMTP id f2-20020a1c3802000000b003d220439cbfmr14097305wma.10.1671114484495; Thu, 15 Dec 2022 06:28:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671114484; cv=none; d=google.com; s=arc-20160816; b=i+WFdTNr7DXoSeL0Vwqb4lEjjXULgnJ3CEeYi7EHtYKXAMdo7pYTENA5+iroHEnx/6 39cugokXftv6VZ0VKYDUGupYuwHy/fyMdg+f9kfQhPDSko3YA3LHRZ2YS8mk3eJwGHVd DGbHTSQL9RgJxvjbEjjCGIo6IJQeOQaI3ab75ObdvsM08Ef86JW2PXxk38lRfy1g4w+F 3haJCUOe0JOnJ1NUgeoewDou6iY6VQeeyrvipZoY/ubLWFe+oTHptGyoirNVZ2lKJHbt AAWIs54FuWjAChXHf/M6Og8TNiE7XsJRRjcSBeoRWTxXBvi48b4s4l7AJlLIMSMVQfgj nGag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=/X6ajsmtDLQhQ1oBFLm8VXjSFHmKUtIYW6p90c2Yfi8=; b=KJrMiTeBj7uFWcS1aNz95z7dNJb3o09sdfcaL6dDdvvByzbGqs/CCZDWhNS52tCyfy v8k5G90LpP5VWlKimtw0GYcI8apPHA9y3xxlHd370rRxi/jucxpV1tax8ME3tePoS9u5 s9WTZz2jTgkDwv8SkhNMu/8hsL46zHnMdxqwaMdXwniJRYQWSjTaFA9sEJAmmZll1+ve U9pvnw/Ns5309PeU7qAGB9SNaUadN6/hsQ70EnzHf1GdipRgkKQCbE1UXMx8T5zR10nB 87pKcJ4j1zF1B4qdlQSKXs2GOh+MNHx/+wxsA/ubaQycJWMH1zN8vNpPN4Gc0WcIfkKZ va9A== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=IGk+YQ7d; spf=pass (google.com: domain of fm-52304-20221215142804fee2cdbdc6fc2c6fcc-gieodb@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-52304-20221215142804fee2cdbdc6fc2c6fcc-gIEODB@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id v6-20020a1cf706000000b003cffb3cf5a0si278012wmh.2.2022.12.15.06.28.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Dec 2022 06:28:04 -0800 (PST) Received-SPF: pass (google.com: domain of fm-52304-20221215142804fee2cdbdc6fc2c6fcc-gieodb@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20221215142804fee2cdbdc6fc2c6fcc for ; Thu, 15 Dec 2022 15:28:04 +0100 From: henning.schild@siemens.com To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH v5 3/6] meta-isar: introduce an example to use btrfs Date: Thu, 15 Dec 2022 15:27:56 +0100 Message-Id: <20221215142759.26327-4-henning.schild@siemens.com> In-Reply-To: <20221215142759.26327-1-henning.schild@siemens.com> References: <20221215142759.26327-1-henning.schild@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-52304:519-21489:flowmailer X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=IGk+YQ7d; spf=pass (google.com: domain of fm-52304-20221215142804fee2cdbdc6fc2c6fcc-gieodb@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-52304-20221215142804fee2cdbdc6fc2c6fcc-gIEODB@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Henning Schild 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 Thu Dec 15 14:27:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 2326 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 15 Dec 2022 15:28:12 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f61.google.com (mail-lf1-f61.google.com [209.85.167.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 2BFESBEK011763 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Dec 2022 15:28:11 +0100 Received: by mail-lf1-f61.google.com with SMTP id p10-20020a19f00a000000b004b028a42706sf3973610lfc.10; Thu, 15 Dec 2022 06:28:11 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1671114486; cv=pass; d=google.com; s=arc-20160816; b=Zx5DIHp7LUB+6a7lh5+yjM27SK8RM05MbCwvrgp+Vbk2J+4CrlDNit+oAbKRjbyFaU 5n3OENf2KiUmFMOC1B/0LZ3jPJhRRsZUwMnAb2DCpriK4ycuocjH6obXfVAxqQGql8SO KGhnNxjEMOnxRpL96PfsWjxGi7Hku21hNbpQR91274U+H7X6PqMVkpVi4IMZTqpMQKrO 5/BeQxAQcG5BDAODTYfjf/g4eavhaWKDHdKun7RJ8/qbgFC7lbrqJFFYnpVypqsShzuJ ngsJtX2VfY9LPV+Y9vkniaEPCksln30gNuIOmCpXai5juXDzrzHHUtQVDTVEVjUm+XgV K10g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:feedback-id:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=D8vCkYdLqyvMSXY5e4LAGrJnfsh2ZPmx+MgmpuYsk2s=; b=ALJtJVdNx0iWFfOJbLghQf9G6dJetc+ZqTt9ZM4N/ST9elO6GdpAB3pGckaGuecmmh A64qvTuGJudQBb2CNZ4++XXnrflvn8zb9ISz0rCYkzZfC7L7Y0Nm82wJ99YshFb5Dy2G rcKyYpWc3/5BrCMVKUUJNUVn19v44TRQ8AJoVfI97i5jj3zf//xoUPuUCFzjrw5iZ0WY nEgWJZR4GOe/Q3WkfTSS0jzYIsDpk+LEmS1nZMjXhUQc2tmdfdtRFOD/D9dWjUmXHGmi 42/LiciJItX+9I5xfppA/QHKElI/1OBnB0eilvWzjPjcauFvqx5IyIT2jTNQr16Uwxei JUoA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=l81aZITs; spf=pass (google.com: domain of fm-52304-2022121514280455389dd56cd5473eff-rwoq6e@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-52304-2022121514280455389dd56cd5473eff-Rwoq6E@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:feedback-id:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=D8vCkYdLqyvMSXY5e4LAGrJnfsh2ZPmx+MgmpuYsk2s=; b=b3zYLpmDjrb85aTWU+2VP3JEDh2tanWVFfu44iVFS8AVwAT4m4Y/BxkUJbWO/CqLwt dpH5JIjkJbxIGwDXftebYvAsx86FtNE+ptZNk7O9QOWWR227rMaauGbvGvQMkFEJMBRq CXFMikTmkqml7k04vAq23rJ+Zhn89b3eZ34duhfI8JjF9vXOJq+7rJrvkkqYUmTQslEm mf1AAr1v3MkFRfFV2RLu7LegdL6KQruU9GU8DNF/F1gZfAvmor6n7ilwXlIDq75eU6pt 5y08ZQG/nJqR11sJYD3MhfOs+P0+B1TrC0csx48CO85aZ51WibMfE4fSV4hRVqpX1Dgw nDDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=D8vCkYdLqyvMSXY5e4LAGrJnfsh2ZPmx+MgmpuYsk2s=; b=h70kA5hlrKUkly4ijz8MZWf6wQqwGD89XNo9n1QdvzbBdqu5fVGoY6Ww5Q/idDaVeY nqEuETpjI20CXrZ1pdSc6dN1XS0tScM6EaqBU++/nY8T+/1F8qbBHWDCiEKpWw8Iv2jS fLQMq3HiZakaVybtXyuhVLvt/ahmWbT5H9oib5+aG03e8IXHDXG/WwsgiS6WA2t0ltfZ zFbJ75F84lTg7QDJIYsez2CltYw/Qk+aYpSGq24MK+TpeA52GAFi+ZUri17wpxFrlRNQ lB9GhJhOXfNzf4D0S6CUQjqnJb4Bf4auGLvvT65tuCqZ36Jf1GFl2+KlxlBQLcDgTILF NGrw== Sender: isar-users@googlegroups.com X-Gm-Message-State: ANoB5pln6PbOjr56cJokaUySL5AnyaiF2ptt/+XQyCKPuB4mGq0HoPP+ 8YLkvQcKGLn1xJU4JnLZmEA= X-Google-Smtp-Source: AA0mqf7TKCqEwXxJIPx1OHbBshLz4MtDdzz3XXBbpQQsKpN30nNSs57p1pKIdesPES8d6upDjwolmg== X-Received: by 2002:a05:6512:1389:b0:4b5:84a1:1b6c with SMTP id p9-20020a056512138900b004b584a11b6cmr5405493lfa.560.1671114485954; Thu, 15 Dec 2022 06:28:05 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:208e:b0:48b:2227:7787 with SMTP id t14-20020a056512208e00b0048b22277787ls2703915lfr.3.-pod-prod-gmail; Thu, 15 Dec 2022 06:28:04 -0800 (PST) X-Received: by 2002:ac2:4a9d:0:b0:4b5:7338:e2c7 with SMTP id l29-20020ac24a9d000000b004b57338e2c7mr3549681lfp.53.1671114484866; Thu, 15 Dec 2022 06:28:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671114484; cv=none; d=google.com; s=arc-20160816; b=JF+XpuBy4JcBnkwZCWw5vONeohFwF5DNCXCwTzSLD5Nar25Kt1yhmfLy8VHyf7b3WS 7xyecauJarjyfTe7T2iLGTe5EUl9Q0Iz7nplJ/fRQqI0i+0vN1oikqPnSoGoE46MaU0Z juMfvMzHz8bneauWhW0vJsbUROIXdteBemqdmv8vb9jkaRWJrczjFvfvtMg/RIOqZqvC OWS4KkwH36rCZt0Xykt1cYDDanygu234K3xq+pfv9J2A1McFvazolwdAbz3Sl7SbU84c KaWnmz6TQ9RaWmc2WJGLZvAzsFqGWixyQ2PKdERN91Nor1r2oQttLeA72/M2anN1FD4L MH+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=zzYc/enAhlDqff2RaOLDGGNiu4bbLo0lhJ56WHc4IIE=; b=DhOnVtuGPFSf2cSlcpL/XWxGJQi2K13ZjqDsEnmKVnPT750dTY+RWhY9w5LH7G/ayy blvw3EiqVsmxI/sxO/ewXhiNkTpbctFI2+kWzA/YUsg5b1M9h3li4sdwirIybJ5BnKIE PoDiu0SQC9xyR6b5x3c5vY1841j1Ej1iChtoZv81pVEyZ6yKLLgBvv4VffFHhyWWZ9Ho 24lfx/4PKxPsT4b+LNg0hScWDrfrqD/8xNQfn1Gsbat1wcwuKF/XoJpDkBz0kAajcDCh Jp6PUu49YcYWYToc0+idwyHN182Yio3wnQP3y0LQUnCVrhluHmKneRV0unXF+BLkMQJO 1oUw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=l81aZITs; spf=pass (google.com: domain of fm-52304-2022121514280455389dd56cd5473eff-rwoq6e@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-52304-2022121514280455389dd56cd5473eff-Rwoq6E@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net. [185.136.64.227]) by gmr-mx.google.com with ESMTPS id u18-20020a05651220d200b004b4b3e2e283si437844lfr.13.2022.12.15.06.28.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Dec 2022 06:28:04 -0800 (PST) Received-SPF: pass (google.com: domain of fm-52304-2022121514280455389dd56cd5473eff-rwoq6e@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) client-ip=185.136.64.227; Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 2022121514280455389dd56cd5473eff for ; Thu, 15 Dec 2022 15:28:04 +0100 From: henning.schild@siemens.com To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH v5 4/6] CI: improve cibuilder readability Date: Thu, 15 Dec 2022 15:27:57 +0100 Message-Id: <20221215142759.26327-5-henning.schild@siemens.com> In-Reply-To: <20221215142759.26327-1-henning.schild@siemens.com> References: <20221215142759.26327-1-henning.schild@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-52304:519-21489:flowmailer X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=l81aZITs; spf=pass (google.com: domain of fm-52304-2022121514280455389dd56cd5473eff-rwoq6e@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-52304-2022121514280455389dd56cd5473eff-Rwoq6E@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Henning Schild 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 Thu Dec 15 14:27:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 2325 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 15 Dec 2022 15:28:12 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-ej1-f63.google.com (mail-ej1-f63.google.com [209.85.218.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 2BFESBsj011762 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Dec 2022 15:28:11 +0100 Received: by mail-ej1-f63.google.com with SMTP id sg39-20020a170907a42700b007c19b10a747sf4518653ejc.11; Thu, 15 Dec 2022 06:28:11 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1671114485; cv=pass; d=google.com; s=arc-20160816; b=gNtzoCwvE3V92Z5Q9tJkfUm5JlPcL034NM/sjyUCZWUU5Ic2EaVEXl8Bd6Ox+8Tm7K p2kAdbKaOSBkbyYLeOTPMlE5h60iShASoNOZujsdCAl0XP/tPN1m9LcXTBEbumER82/B Czp7+zKi8/7VuqBVgMXoWtLnNMvSXjum7vee6olT9KkNV1HDHQb7GeqtPdFVVF/2fY9V 6Hu0GhTMmWE78D0zUo0ZFpWW0Nmkera7DTq9pnrZ11kRl9YXjd3MFVf4nKClLQSkot6G JE9XsYiNr3MJiPkGmp9gT0RWyu3Kwd2Sh+9MRYkxqdcI/RNWvhj4NUEowTOiXw+pVsSN t6Vg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:feedback-id:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=wOfzDx0nrt4WPm2QbGpo1jNR9qd6458w7oRdlF3xgPI=; b=CJIVCydmCO4pGaN8QVAj7uGROAkmvy51b8fnDofXtoimObRFL+CGPdtuZLWDxwosHo jkenShC3L/pvsyw+osAie5wWxxkXYOqQvNy9iYEd9k7xv0GyFxP8WuZZjJSq3K1+AzlA DfCfzVVY56MAm4YIgoYfo+vZRoTQtstei+Y8Fn7QdAEuKLBBRfGMdtGR1Pn9IZgQ/zmx ccgCGFCMu7mmpHRD6Tv6M4feNOSwX4RhFRqdHBIvbzIiVA7AJgb9rg2Iueef3raevMW4 yMQQ9WSZWykp4MYPZuoWuCP374qg0P5P9Ea7k0TWpbXKqDkKJysKoA7CPwxlV312XtCF 3E/A== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=PStB5zUq; spf=pass (google.com: domain of fm-52304-202212151428044c813e0fff8db64d5f-s05y__@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-52304-202212151428044c813e0fff8db64d5f-s05y__@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:feedback-id:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=wOfzDx0nrt4WPm2QbGpo1jNR9qd6458w7oRdlF3xgPI=; b=XYX/uIzDCdtWHAP0dABQV4Yg5+2iEWu8BA9h362Q34dPrN0AiQcLEgs3ZoD4RpFepr 1TYht8MCK98IdGTjbn1hKYUQoYuZEKBBHlQJ2PmvXpFsy8jIArJ9+PZPEmOxcbQ9reWz r8uALTKnNEF9TaB9DkGa694piOU96hMEKBgoZjqw6OGb8c+U/ydsp6Nl2jG3L/Zv+cyH z3eJXtEaqihvv62no6T7kjYx2v3H32/D83AEBU+CsEw4zLtBIhxVRkvF6Kr0pB2QSo08 w//Hcd2UsfUEHeJth7HLhIIqYGSJ2LeoiQK3X+DP3MmtqFce9bf37SBmZMD+r532/tET r5HA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=wOfzDx0nrt4WPm2QbGpo1jNR9qd6458w7oRdlF3xgPI=; b=r1saM2zN+kvaXMVYKJYvj7dWVZJf8NGZ30ykGYpXhXpptkQTcJSTSgrCfQLmr1qMj8 85q8D0tTm0ymuEqn+XANPt9rMkihwaBNDaU8gf00JgUqG0qsrsmHEqhtEQFTqsJ0lFk9 Y4Eda8VZTEXixyJSlYQh5zw0pa4woAgWCT10vsvBHGvYAP0LN2oL8MrB6S7DvnLzhFVj S4Fzwqcx35L2HqbNeAq/99wIMuZCNdVMtRh2kOoFeA47PU+0aJpVCN7Ynist+u+q4P+3 0jlJ0vHQUfgcJg7STiPz/OW8NN+xbXi2TUILpFxYwPI7MnzQaFsBdHtZPwgXk9I/9PJu nWqQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: ANoB5pnmqVjgY9xCe78/Bl9lAX2a3pmHYeKVq57nljIIcQ4U5F+atR2Z oODx8P4igQg7JQzHM1519vA= X-Google-Smtp-Source: AA0mqf5hoFhNRcLyU10N+Z9AngyE1g/6EGtEO/22DaeWEs15stBopW5afZ8CZPRuMd4mX2sP5KdSEg== X-Received: by 2002:aa7:d393:0:b0:470:39d2:24d7 with SMTP id x19-20020aa7d393000000b0047039d224d7mr1458287edq.368.1671114485757; Thu, 15 Dec 2022 06:28:05 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:5215:b0:43d:b3c4:cd21 with SMTP id s21-20020a056402521500b0043db3c4cd21ls4795460edd.2.-pod-prod-gmail; Thu, 15 Dec 2022 06:28:04 -0800 (PST) X-Received: by 2002:a50:cbcd:0:b0:46a:331:8e72 with SMTP id l13-20020a50cbcd000000b0046a03318e72mr24249938edi.37.1671114484785; Thu, 15 Dec 2022 06:28:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671114484; cv=none; d=google.com; s=arc-20160816; b=fok0ZzpCx9mBvjLICoLwL1EGcoyeGeJ+6MZNo3Qb8W/Tx/G+de21gfG0waC+ehJXP6 MIJIHvE98SmqXGXulRwmJSTvmCG8K9bKxYTtLoDyfNBgXENrU1w2iHkKKvTtfNV+dH1x L8s0Sk6bTymQH9yrfZrnJODb8Y7z/u9nRIrAh04/zF35cgcrEEsmb/n3wscXCFkQYbCf jlItcSXbUjs7PR4GJI/2J6Rsbpvqtc6jR807HLRVVl16Cvv7HFJa6uQNt1u/88QzbnLa VPmIFoeJtf2J93otCAGx4buti5kdWnuIYjBXWHikOrQCf1fkHT3LAIMC35TS+J+P1Yw0 8I7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=iPkDTSG3PkWd7fjdxganf9f1h7Bw140bmwMAbADzcXM=; b=JzB1dCtvFjluxFWGoaGxPQ1e76onLz1X0AyqMiz+fnNFUjC2VCAjX8kpknaHw9vm3l gfMeUogPc3mOVfZqW/tSg5L41lOZnDVJ2iE84AzZGX5/FysRN+fpRE5JxltxVx0iKDNF D270fBd7X/yKOFDp5Fwj7FbQzVLq5HxXymzTT509n8rNhBuRD5QSG87jJGUcErBu9srB tziLT+DqBQ7/Ta7SXEza+4K6NeFIn5BaT7QGdE9/X2gzAiOW/niOvvmrD+kwxlZOWzP5 MKqVx5sFudp6ydd6ZSfjuqVLrt0LlDR0a+72WWIX5H0YECQwb1fl0w+gACbzdoJLk2mJ P3rw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=PStB5zUq; spf=pass (google.com: domain of fm-52304-202212151428044c813e0fff8db64d5f-s05y__@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-52304-202212151428044c813e0fff8db64d5f-s05y__@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id ba13-20020a0564021acd00b004704657766csi361090edb.1.2022.12.15.06.28.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Dec 2022 06:28:04 -0800 (PST) Received-SPF: pass (google.com: domain of fm-52304-202212151428044c813e0fff8db64d5f-s05y__@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 202212151428044c813e0fff8db64d5f for ; Thu, 15 Dec 2022 15:28:04 +0100 From: henning.schild@siemens.com To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH v5 5/6] meta-isar: install expand-on-first-boot in most images and add space Date: Thu, 15 Dec 2022 15:27:58 +0100 Message-Id: <20221215142759.26327-6-henning.schild@siemens.com> In-Reply-To: <20221215142759.26327-1-henning.schild@siemens.com> References: <20221215142759.26327-1-henning.schild@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-52304:519-21489:flowmailer X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=PStB5zUq; spf=pass (google.com: domain of fm-52304-202212151428044c813e0fff8db64d5f-s05y__@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-52304-202212151428044c813e0fff8db64d5f-s05y__@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Henning Schild Here we take the most common and generic images and add some empty space at the end of then. This will enable better interactive use of our example images since people will have some space to install some more packages. While the space seems fixed it really is open end if the mass storage happens to be bigger, because we install expand-on-first-boot as well. Signed-off-by: Henning Schild --- meta-isar/conf/machine/qemuamd64.conf | 1 + meta-isar/conf/machine/virtualbox.conf | 1 + meta-isar/conf/machine/vmware.conf | 1 + meta-isar/conf/multiconfig/qemuarm-bookworm.conf | 1 + meta-isar/scripts/lib/wic/canned-wks/expand-padding.wks.inc | 5 +++++ meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-btrfs.wks | 2 ++ meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks | 2 ++ meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks | 2 ++ 8 files changed, 15 insertions(+) create mode 100644 meta-isar/scripts/lib/wic/canned-wks/expand-padding.wks.inc diff --git a/meta-isar/conf/machine/qemuamd64.conf b/meta-isar/conf/machine/qemuamd64.conf index 6b40cb50702e..a1be5e5b113b 100644 --- a/meta-isar/conf/machine/qemuamd64.conf +++ b/meta-isar/conf/machine/qemuamd64.conf @@ -19,6 +19,7 @@ IMAGER_INSTALL_append_debian-bullseye = " ${SYSTEMD_BOOTLOADER_INSTALL} btrfs-pr IMAGE_PREINSTALL_append_debian-bullseye = " btrfs-progs" IMAGE_INSTALL += "sshd-regen-keys" +IMAGE_INSTALL += "expand-on-first-boot" QEMU_ARCH ?= "x86_64" QEMU_MACHINE ?= "q35" diff --git a/meta-isar/conf/machine/virtualbox.conf b/meta-isar/conf/machine/virtualbox.conf index de3d04c3c4b4..8c3e9bacbf9b 100644 --- a/meta-isar/conf/machine/virtualbox.conf +++ b/meta-isar/conf/machine/virtualbox.conf @@ -10,6 +10,7 @@ KERNEL_NAME ?= "amd64" WKS_FILE ?= "sdimage-efi" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" +IMAGE_INSTALL += "expand-on-first-boot" VMDK_SUBFORMAT = "monolithicSparse" IMAGE_FSTYPES ?= "ova" diff --git a/meta-isar/conf/machine/vmware.conf b/meta-isar/conf/machine/vmware.conf index fba639b19350..42503374742c 100644 --- a/meta-isar/conf/machine/vmware.conf +++ b/meta-isar/conf/machine/vmware.conf @@ -12,6 +12,7 @@ WKS_FILE ?= "sdimage-efi" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" OVF_TEMPLATE_FILE ?= "vm-img-vmware.ovf.tmpl" +IMAGE_INSTALL += "expand-on-first-boot" VMDK_SUBFORMAT = "streamOptimized" IMAGE_FSTYPES ?= "ova" diff --git a/meta-isar/conf/multiconfig/qemuarm-bookworm.conf b/meta-isar/conf/multiconfig/qemuarm-bookworm.conf index 126935b06fda..0b9ecb664545 100644 --- a/meta-isar/conf/multiconfig/qemuarm-bookworm.conf +++ b/meta-isar/conf/multiconfig/qemuarm-bookworm.conf @@ -7,3 +7,4 @@ IMAGE_FSTYPES_append = " wic" WKS_FILE ?= "sdimage-efi-sd" IMAGER_INSTALL += "${SYSTEMD_BOOTLOADER_INSTALL}" +IMAGE_INSTALL += "expand-on-first-boot" diff --git a/meta-isar/scripts/lib/wic/canned-wks/expand-padding.wks.inc b/meta-isar/scripts/lib/wic/canned-wks/expand-padding.wks.inc new file mode 100644 index 000000000000..701fba764176 --- /dev/null +++ b/meta-isar/scripts/lib/wic/canned-wks/expand-padding.wks.inc @@ -0,0 +1,5 @@ +# some extra space we put in the end after the last partition +# that allows testing expand-on-first-boot while at the same time +# making our images more useful because they have space to play around + +part --source empty --no-table --ondisk sda --size 256M diff --git a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-btrfs.wks b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-btrfs.wks index 014ecca61f0c..e22dba2f83f8 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-btrfs.wks +++ b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-btrfs.wks @@ -6,4 +6,6 @@ part /boot --source bootimg-efi-isar --sourceparams "loader=systemd-boot" --ondi part / --source rootfs --ondisk sda --fstype btrfs --label platform --align 1024 --use-uuid --exclude-path boot/ +include expand-padding.wks.inc + bootloader --ptable gpt --timeout 3 --append "rootwait console=ttyS0,115200 console=tty0" diff --git a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks index 754fbc46f8e4..7fe2953f5ff2 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks +++ b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks @@ -6,4 +6,6 @@ part /boot --source bootimg-efi-isar --sourceparams "loader=systemd-boot" --ondi part / --source rootfs --ondisk sda --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --use-uuid --exclude-path boot/ +include expand-padding.wks.inc + bootloader --ptable gpt --timeout 3 --append "rootwait console=ttyS0,115200 console=tty0" diff --git a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks index f3addbc7515d..80c3a5359b1f 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks +++ b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks @@ -6,4 +6,6 @@ part /boot --source bootimg-efi-isar --sourceparams "loader=grub-efi" --ondisk s part / --source rootfs --ondisk sda --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --use-uuid --exclude-path boot/ +include expand-padding.wks.inc + bootloader --ptable gpt --timeout 3 --append "rootwait console=ttyS0,115200 console=tty0" From patchwork Thu Dec 15 14:27:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 2322 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 15 Dec 2022 15:28:11 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-ed1-f63.google.com (mail-ed1-f63.google.com [209.85.208.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 2BFESAmS011753 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Dec 2022 15:28:11 +0100 Received: by mail-ed1-f63.google.com with SMTP id w15-20020a05640234cf00b0046d32d7b153sf11773261edc.0; Thu, 15 Dec 2022 06:28:11 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1671114485; cv=pass; d=google.com; s=arc-20160816; b=Bi06unRomhr4CTe4Sz+dA7uMy71EH1F+p3ltPERsIaeP63xq8ZOiCn+omoa+sWXLCU dbjSdC1Lbra+7jFsGlNMFZA0LKuGQyoVN/g7o7DNkUCk6zdJBKxdU4Ew7G1uOq9VUXOx I1iOklILwuXhlOwJux7dJ9QnRDRbIkE8OrKE0MfyXeHQ9/ZO4rh34X8lz/K6/o589gtm ymEDZTWQUqBB/OmXZ7IMzWFaRuGcbAH1ZQKBvfqbPs3HWLi5o58uDi5hIZa8mI8O3Nz6 wRDHysYW7fhecBWLZr9iJgCxgWSG1S32Xnbl9wh45oobKpsipe3Jw9xXMVIBHR1ZEyJt cRDA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:feedback-id:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=vvbQU+rJkWCfZLVImaHRs7uJojSCpNPC0uUlP7pscxM=; b=vpzWBFRq0ubQVudS8mALFAO/V6TnNBk5eqFx7HLehsouH9HGZvQj0knWDTispmS0lM 5TKmHCvv/H+1hjwnaWbKGSnkdRXKhpUAS/tY8Ut+S3A7Mnh359lhGowcZA/KDRuBkBQ/ 3sGJVUxV0vUUu0un/kW4oaaaHJ4zQIvVLJW1fAkbbUwMWUv/3qdMl7z4saIaO1r0q642 Vhmm4sWgY48TjRq74t5mRlnHQHMt4COakV+Gqmqi9/0wKKkTS2fcMsiFi8jHoXdg5hbm B0Zg4Hr5Lr8L0rbQiZYGj3i+R6b+9X7lMeumnpthjrOrzKmve9DYwYrw3/jTszVafoVA S74A== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=QV7dwTzF; spf=pass (google.com: domain of fm-52304-20221215142804331cd68970a5203f8a-k34htq@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-52304-20221215142804331cd68970a5203f8a-K34hTq@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:feedback-id:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=vvbQU+rJkWCfZLVImaHRs7uJojSCpNPC0uUlP7pscxM=; b=MUT7csnxMYU6LjwiFs5IT+rGlxxLhkaEtT5Z9H0K12P04jB4b4iibsYKtfQzT58sw5 cUS6p95+yWhpnnSDx6Fjh7URq5mvSMuvboBad2zzZnhr3QirY7vCtMtpShYG+V4eHY64 /+CZlzT/qomWH5J5jCA/oFKPKRjuzCQt0HM6xBnNmsxkXLKlRV6i5mZ4UxMEVZBiqW7p 6P95l20WQ99eJyNwTZCFFPZUrEoW3vt2DLHoc95JB8vFpn2wprNZdrGSO5h+JmxIRFuo YRrHA/a9qMuXtptINGIBnqhJ370TCsQI+lgmqWvgvOnxy9sFctAFVefGLOCv8EvhqHDv jJhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=vvbQU+rJkWCfZLVImaHRs7uJojSCpNPC0uUlP7pscxM=; b=gGirIxcGZSFoNYaRT/kSDGgrNUha2/+k8AfxuULrxSB6nwhTZyBkPTaurici8YMloD eoM0DDS3fT8v+fU8hrTslZPJO1xQVojtJ9ElN2sM3hsOH5dGSpwas7RlQYlvwpMJZmfO Fz5jIepOb+y5fVtWPe+FC7qC89LmLyNpgHgkZCdh2ZO+Z5r1ZjpMjqdxTPHWtPVYnrQf wi05K5xt7GyJzX/fA1psMq4y1m25GsJLDRTikrvdLi2wCEdmD+7thH6ta0OX9Lxs7QVj roEMfTvaL9efehd/7SWcCD8Pc+p2yRxEY2b16zYSTsaCvixt+PL+Ue/kSVTrtcoObHB4 ZJmQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: ANoB5plxMk1NAJc7nY+A4QAaMtwJ8FYyDM4bf7VrGrlcr37o5Kmpx7Q0 iGCcc97Z+2xEpK5UZVzNCDg= X-Google-Smtp-Source: AA0mqf6bLSK8h2RCvwIrq/wfxqUUpWIeNHfnbbKh6v1+tPR8RB4Ijd8241iK+iPR931gBocfN/HElw== X-Received: by 2002:a05:6402:b81:b0:45c:a651:8849 with SMTP id cf1-20020a0564020b8100b0045ca6518849mr18303971edb.209.1671114485759; Thu, 15 Dec 2022 06:28:05 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:5215:b0:43d:b3c4:cd21 with SMTP id s21-20020a056402521500b0043db3c4cd21ls4795468edd.2.-pod-prod-gmail; Thu, 15 Dec 2022 06:28:04 -0800 (PST) X-Received: by 2002:aa7:ce91:0:b0:46b:67e0:90d0 with SMTP id y17-20020aa7ce91000000b0046b67e090d0mr22981290edv.28.1671114484895; Thu, 15 Dec 2022 06:28:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671114484; cv=none; d=google.com; s=arc-20160816; b=GuMfaOlNYJhZ2iNNBvZJ+pDrA3hv3NyIsrca8+6ehTg/wu8ynmxDF9Gc9oyrbbwWGx SBPfD+zGcuGgHBdFuwFMEk27Mlf3X5Af67UXSoaE8E9lt0yDNdTQ1fbYEuoONTczeANs M0XW0Pp5hHqyv6JJ3JiaRkU2MsGfLUlpwb7Zcdr1lYRuXCoD+IR90NqQMvZXj99s5JvH Obn4B+7H8LiJO0UoEDwDqCxswgHXU3dzR4Rn0he/m5WrSs9RGG7UdFRc+bPoVkguKv6T uehJGu2bY6b5pN1SwVc8Q8ZngbeYBL3leXbe9nH1uXHdjs29zyOQkhtILqxveHrgBDKY jELQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=D6BDndyF5qufOp2Kzdmq4jgoiZ8/AwmxFK3p7a2HFFw=; b=FJz/OggRURNQwu7OEaRMMvsB88FONJV8AAuhG3ec5OjWm4W21L+MWf+02yK3QBWyxT 47Rh1x6EhiR6vcGDIZfLJykRrMZLWRwR5C5y7Sj13a7smvw4hWYLsAghApmSBMYQgHIz FTw+AYxW0W+XNF2NqweXQRD42nag7BAI0FqvDz9j2bQqnapMJiwUGGx90Sk/WBU/Y/CL YK1avaFhuJDULfxT1kofXBrM2mVoO14WS1D5iIWdB5l793bNivk4TXJ4JgbfoHfNrxGR dPfAslKMVXal4hH9fKn1qOJRZLRHwVNQj5GT75dD3PjH/MeEEBGAMLXzaRrLu4g6oyNr oFcw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=QV7dwTzF; spf=pass (google.com: domain of fm-52304-20221215142804331cd68970a5203f8a-k34htq@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-52304-20221215142804331cd68970a5203f8a-K34hTq@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id ba13-20020a0564021acd00b004704657766csi361090edb.1.2022.12.15.06.28.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Dec 2022 06:28:04 -0800 (PST) Received-SPF: pass (google.com: domain of fm-52304-20221215142804331cd68970a5203f8a-k34htq@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 20221215142804331cd68970a5203f8a for ; Thu, 15 Dec 2022 15:28:04 +0100 From: henning.schild@siemens.com To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH v5 6/6] CI: expect a message about filesystem resize vom expand script Date: Thu, 15 Dec 2022 15:27:59 +0100 Message-Id: <20221215142759.26327-7-henning.schild@siemens.com> In-Reply-To: <20221215142759.26327-1-henning.schild@siemens.com> References: <20221215142759.26327-1-henning.schild@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-52304:519-21489:flowmailer X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=QV7dwTzF; spf=pass (google.com: domain of fm-52304-20221215142804331cd68970a5203f8a-k34htq@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-52304-20221215142804331cd68970a5203f8a-K34hTq@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Henning Schild 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 | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index 07a9edc56d9c..8b67815442a8 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -231,6 +231,20 @@ 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() + wks_file = start_vm.get_bitbake_var(bb_output, 'WKS_FILE') + 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 +279,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)