From patchwork Thu Dec 15 22:16:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 2328 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 23:16:20 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f59.google.com (mail-wm1-f59.google.com [209.85.128.59]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 2BFMGKef013481 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Dec 2022 23:16:20 +0100 Received: by mail-wm1-f59.google.com with SMTP id x10-20020a05600c420a00b003cfa33f2e7csf315069wmh.2; Thu, 15 Dec 2022 14:16:20 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1671142575; cv=pass; d=google.com; s=arc-20160816; b=XNGL0nKzxfjQ7lXOvcbSpBO5sRSdf+hEigRtp3hu+zO0mW449rloTjHEzLzxxz+b20 xHi22ARcMc12ktfr7vXBAUPjTf09+LR1BJFHD4ATDE+a7X50/GkIaAEkGrH8MYtccP9h wBfClTzd+2GaUuSwpFUvnoo1UzSYIuVR0nB2OcA6U0vBismWacOP22MUPL6hFYnfjsnE VThWmyR5sjkPlxuHOJxN/4lUJMRbCA6eAtiUrdXqVT3b2R7IBUBWQ6XeGuly1wbkeyUe Utapf2oEw25oRuEyG6KWhvnyTUo7dvTT2YQ2qjr31hAy2r9DhxiNBF6MpcyLQlfjOQ1g tmOw== 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=vEF54+7uTmiKSlxkrLDR933vqtAmOSN7RquISHf2Hwc=; b=Pog71iGsmW7vzZc+G9vctsfRw8baDA51JA0HYfwu08a5MyDnYwjcFIhrCrpw3TcOY8 1wy/gw9SozfSkgHSqfBLkS5UGQfOgH0xV0MzrS6GZdGDjoeJyMXDa67xJNEZgeQbJi84 BmtU9EDxeaLoQT5RNrz7ZHedphkJHzFRNzc79vjmc184Ba1j+QlhchyqDsur6TTkPzP1 P8tscI6cG8hDRNiW01goUTi6RV1ppWbwZg26ox+DIGVxx3hFhy4Qe8RV/caD8xORHcQt jSBPJwtziob3vxWmQC7Az9NbbU6DqKPQ4YzAnJLtvXDkOzhpa68JdX4niPZ70LRRdG96 iKPQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=FaQlzKsy; spf=pass (google.com: domain of fm-52304-20221215221613dc679666c774386e86-47cto1@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-52304-20221215221613dc679666c774386e86-47Cto1@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=vEF54+7uTmiKSlxkrLDR933vqtAmOSN7RquISHf2Hwc=; b=eiLEuprasCWGcxP0D27kWStAyGgA5Rkrr+ovMIYgSjiU8Id76cmCO52WSRBlQxPjSy hKQu6iB1WEs51lbGRhT3mDfpqbU8Ntct2prLoO3uUAlGD7skfGVm6jnt9LJbDtMQ5AkH Q9XsyEbWdov+yMRb7UTc0Ep5Jm3cYqnMRfSljIWcanNp+voQKRTPKrNqeg9D88HhEDbk 4bA1okV6mP7RXmf7Q4GEUv6KHTSOaOq/EhqtBjOq2a6KaTgAjPVJWh8mKoiEGJoX/7hk vIPT70AMIPz9zOLbpglrdtH/zfeWxlRP2q5JR1BPAVvubi9dLX4UBbm/F7BRfMIC95fh SJ6Q== 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=vEF54+7uTmiKSlxkrLDR933vqtAmOSN7RquISHf2Hwc=; b=o1Fx28NE4iGQVzN9qsWdTkynsl+DV4n2I9CP1flaLMQRNhtJMeg3rb0adoyxE8wLpn vUC54egDjgX3sN8lNuOnMLuYptgYrJBVe7oVe91qCI0+e4Qt1jB3TF+T//oMdEVr8WmO YW/uzO2JjlFAZWGorE8jhv1K2jwnQ1ayLkrT6YyphepJhcdev8buoMW4Qs36ghk649JG vsa0mufA5Dfx4348lTHUEucqw8D/IL6bl69oHeCt4RiSFcff61LtbrERUNGdHopGYIgN EBj3zJ3f3R0IzFUyXOX/fk7MC3HpCUUXTTrUuzQmoPnceri5w7Ls9Mbume6c56YnMw9J 6mMg== Sender: isar-users@googlegroups.com X-Gm-Message-State: ANoB5pmZ71tQyucmnYFnMWjkxKMvW4GcO71NvklI+PtcILLOtF7rKYva iFfAAILv+hGI85HYooRWHfc= X-Google-Smtp-Source: AA0mqf4txROeUQ26I42IULZTzfsMWwwrvGD6ZadTko9j0/C/JiWBSDyj5tdUzbleRIeHFsr48Rr36g== X-Received: by 2002:adf:fcc8:0:b0:242:453f:fd14 with SMTP id f8-20020adffcc8000000b00242453ffd14mr16630279wrs.468.1671142574834; Thu, 15 Dec 2022 14:16:14 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:230:b0:242:2700:8318 with SMTP id l16-20020a056000023000b0024227008318ls763018wrz.0.-pod-prod-gmail; Thu, 15 Dec 2022 14:16:13 -0800 (PST) X-Received: by 2002:a5d:60c5:0:b0:24f:5890:6168 with SMTP id x5-20020a5d60c5000000b0024f58906168mr12991930wrt.10.1671142573830; Thu, 15 Dec 2022 14:16:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671142573; cv=none; d=google.com; s=arc-20160816; b=t0nR3KOh/3izw6xP3Xqgpn3CBkLPERyFbR6vV415gnwN5tZhmpzSUJLuwZ4Ioe0w0M zc+sgjGHq18Lsr3U89N9hRm2JwYka/m9ydNHNDmHxpVJiWmVQX8AECzj7gdYy7Hyxryp 5o9OeEF90ZncTyA8lPZDCXGVNoSslUEYBw3kc9XnXHDr1hTh4VBRP/aw2IimYxBEwUVN P+P4oprq5qHQXybc6ZgguGmbXfWiAm1GiMNZjpccyLVqcS76+xyMAOMOfC+Moj87UkXQ gGZDx1B24R2ZKQnCXWPjW1mJ9xb6C79b0JyYnzKAyfuHAV2TOU7FFdep2dUGdihdJR3D iYzA== 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=Hhjn5dAhtKP8VVPB/zkTf5zxsrwOhCrxhv5yXH0G4Rtf7Z+fEA91MatjToTT4e3iR4 Y5RJQvpBiDggoGAh9H960uOI3co52zZHPxJwnKK8EMxW83iGv3Wt84WTusesFDiXJR6/ znAwQsDT8Z7yKUdV10erTEn9wlIcRMoU3jnaLhYmKXm3a6SpKijP8GxcpHWSmKFvjFMY zkhSg3gQRST300+jlkpELXz3dYvlf+CZxzZyQquDSO8xiRjWd4s7i6NPj7I+NuRJOn8A j1JXfQ0EhLoowTopjMjSWyczq3slLSEFDOHrs2GHVnA73pJXXhNeC9uvJmVH0IaYi24f ivzQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=FaQlzKsy; spf=pass (google.com: domain of fm-52304-20221215221613dc679666c774386e86-47cto1@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-52304-20221215221613dc679666c774386e86-47Cto1@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id cy4-20020a056000400400b0025664a2d85bsi27933wrb.1.2022.12.15.14.16.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Dec 2022 14:16:13 -0800 (PST) Received-SPF: pass (google.com: domain of fm-52304-20221215221613dc679666c774386e86-47cto1@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20221215221613dc679666c774386e86 for ; Thu, 15 Dec 2022 23:16:13 +0100 From: henning.schild@siemens.com To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH v6 1/6] expand-on-first-boot: really only do that once, especially on failure Date: Thu, 15 Dec 2022 23:16:01 +0100 Message-Id: <20221215221606.5623-2-henning.schild@siemens.com> In-Reply-To: <20221215221606.5623-1-henning.schild@siemens.com> References: <20221215221606.5623-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=FaQlzKsy; spf=pass (google.com: domain of fm-52304-20221215221613dc679666c774386e86-47cto1@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-52304-20221215221613dc679666c774386e86-47Cto1@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 22:16:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 2329 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 23:16:21 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f61.google.com (mail-wm1-f61.google.com [209.85.128.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 2BFMGK15013479 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Dec 2022 23:16:20 +0100 Received: by mail-wm1-f61.google.com with SMTP id h9-20020a1c2109000000b003cfd37aec58sf315827wmh.1; Thu, 15 Dec 2022 14:16:20 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1671142575; cv=pass; d=google.com; s=arc-20160816; b=hTqVTZY3YT+tur7LKZcHojrz14rbKzOOAyDIsZ2d4Hn6nBEdBSt3uNgTvZnxoUfSWY FM0yW6yWcbyYnXXm+NiYDF1UJ+xn82gHdl7SY3LHHYecn5GuqXlx1uktwQrFEB7R8bIM KZ3y6abZHb332yncbr/sSHbh4ulbFxbR3H/W5+57DB5XyNFeI9Nh+XHL33XNYsdm6sf2 YnJEh/Zp9dYN9I47Yi63aa1cb7rDx2nEyJ4SeJKiqcNFdOYX52Agx0MFys83udJphXF5 DYEP4ETuh1IhEF9v4z5O8ifdug7CGeTujxMc+5Q9O3Bm0hf+bVdr4K5/8/QTQJxrD+DA tRzg== 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=zLjADIaQEu/k1plWiRk7SgC5CdUeCmbSmeTKRvdXCdY=; b=vmlL1jDaoKR0rmJuk3ddxo3CfRp/zJsA/wNAoge8vlGAy3cZsPUsWhwQ6b1nkfxxAQ 3KeyPGGzOW8l1Er6KxnMjEXZb8rweIytN7uX7SfB1NvPA8fuZE9xar03QkSczdr+A8A9 XQ6hOJyg+66o+vedeNR9mfpEgq+N8hbqdnBpQKgWBl3OTlm2vuOMs8hetN0dRMHe/gQl UVe8w+iP0XL3JYE7Lr9e80mG6Qf/m8M9V8jRyCHgZdDB86P4/VAN7MCXw3Ss+NmF7OXV TeWDi592wDXQcFPtOqaWdWE4/sohSb4f6DpwX/GZb1D43BU0w1PWM/eMynmOqlBpM4+B lDgw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="L/aY4DOn"; spf=pass (google.com: domain of fm-52304-202212152216134f3d5605de19b49380-3ece98@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-52304-202212152216134f3d5605de19b49380-3eCe98@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=zLjADIaQEu/k1plWiRk7SgC5CdUeCmbSmeTKRvdXCdY=; b=oXZiN37O25f1ygYRhrpMd0EZmzu2BcujiDCKPns68b9UKMvZTDtgIWZ/iCf1f/eGQY tmmlxloh8XJH4QJ2uRxNbRkq4ufLNQ/a0jucmSuscVAmpfHOenH9gWG2qRop8ApD4W3a Jp3VcG+gt8S3EzX9ZKr93Qn3khGPQgt8qpzjpw2XeI5hoAsfV0BYR1SwstDvbLo+I1Yi HDgcS1LVLblTlgrkK3z/bAwVMdMdAKGCJD6YwwnBJm5tTJSljwZyQYK6//CneZMARo9N 0MrXdIJgEmOvS25JHAuYBWdwCXubJD5qmxLLi4IXLIQRlnX30IZnHioxquyPuFt+ux+/ vesQ== 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=zLjADIaQEu/k1plWiRk7SgC5CdUeCmbSmeTKRvdXCdY=; b=iGj6/ClJEUp/CJAfxj55kBSNSrNFI7qfZ8x2VjtNiSUcH0gRNiCwOnlsVzH9Ur2TBI HJqD7vARYfn95Q3lpwBNTWbg5Re5fV8BrsmTc+FCufPqXCB3M4XOKCvc0Qs5RQBikMrc 7Z0Quvq+n7nhuZ1siDJfcbLrntvj87gO9mkohC7h64kSPlDzGHIxujkhSnsN1Qm8Lr6n LCX/ghNqXk2OB33wn3JGG+buy4Zk1V34YDbntEUn5Y6yzy5CfCvH9970OOXvJqyrvC9Q rTEnIcNcNxpnBnyEdnULVQvdkKF51wJ7m2sjxi7uGeouyQyqtwcOFEN4CETFK8+X08bR tInw== Sender: isar-users@googlegroups.com X-Gm-Message-State: ANoB5pmTli575mzupRCkoMUBlIu0JM0EgF3X353GUj3HFjqnY/92UVn1 35YLH+z+XhLE16FJOvLyk58= X-Google-Smtp-Source: AA0mqf7H7Zrnl7Ml6Xyldpz/hw6tUfRQS2WU2ZoJHnRpkunc2MIMBCFdflO2FRVG6hqlUkot2tFxcg== X-Received: by 2002:a05:6000:81a:b0:242:6a15:e257 with SMTP id bt26-20020a056000081a00b002426a15e257mr9815355wrb.624.1671142575004; Thu, 15 Dec 2022 14:16:15 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:230:b0:242:2700:8318 with SMTP id l16-20020a056000023000b0024227008318ls763025wrz.0.-pod-prod-gmail; Thu, 15 Dec 2022 14:16:14 -0800 (PST) X-Received: by 2002:a05:6000:81a:b0:242:69f4:cb75 with SMTP id bt26-20020a056000081a00b0024269f4cb75mr19807673wrb.54.1671142574175; Thu, 15 Dec 2022 14:16:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671142574; cv=none; d=google.com; s=arc-20160816; b=hIufuy7ysASj3SiC8pB9+93OzQljO4Inl+sCpidSXwAHebl4mXGEBx2S4UFnM2aI7D I+EKVbOHW50tHiToO8raqlVoRAXUyp87+3/9z+gymGfyvs/T6Ov+CjzQYK+LS65/4BnT VWBrk+9PplhM+xbfzZPOW6/HIJWIXMP9FkZkkdcAcMG6ls5eHuD/5f1ZASU97Bc8Q/HM AZOhYUberY8W/VrAp1bmCDnoW0smDuRG/x4oBkYAc8GRZmnORfLhem77w0g1Szfw4O9q RMdaJ6Bf3JGw/hYUJpduDww075v0UEkKnW9FBNsjXAThR4aAXonH6anr+pc4/I9pfm4e RuAQ== 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=AFKtBPc6ffjJLrWu1Urkzhv+pH8F9Mq9kw8C7xeW1uo=; b=VWkHQQsuLykFz0XvVK8GvSpESbvP0kLdZExMxqF9eRbuQlTs2yA0o0UazblWluwuBG n7d6huCVt45hxDbGAiSSl2cmIMzWbokSJSN5sK1KdmoFBO8FxiiMzfwiAuE/3ycYnaei cTIUHR21xUVUNcD+yomSOyG7qhaSDP97Tu09zKiEmHUEGLih+IGNrHSnucIKKFuqUTul 8i4TQDc04lYK1RgEwN4rYSvajscglTwCPRl9mtOkEiSf/oTQ5c9L79e5KrE2fAJqGC8p fcPI3ycy/VOTPBCnGkAfNBtAo2qn+EkhIwM9wd/9bPwq7BS3Va0pxAnsvqaqwN2XkV3I dQ9w== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="L/aY4DOn"; spf=pass (google.com: domain of fm-52304-202212152216134f3d5605de19b49380-3ece98@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-52304-202212152216134f3d5605de19b49380-3eCe98@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id cy4-20020a056000400400b0025664a2d85bsi27933wrb.1.2022.12.15.14.16.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Dec 2022 14:16:14 -0800 (PST) Received-SPF: pass (google.com: domain of fm-52304-202212152216134f3d5605de19b49380-3ece98@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 202212152216134f3d5605de19b49380 for ; Thu, 15 Dec 2022 23:16:13 +0100 From: henning.schild@siemens.com To: isar-users@googlegroups.com Cc: Henning Schild , Joe MacDonald Subject: [PATCH v6 2/6] expand-on-first-boot: support resizing a btrfs Date: Thu, 15 Dec 2022 23:16:02 +0100 Message-Id: <20221215221606.5623-3-henning.schild@siemens.com> In-Reply-To: <20221215221606.5623-1-henning.schild@siemens.com> References: <20221215221606.5623-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="L/aY4DOn"; spf=pass (google.com: domain of fm-52304-202212152216134f3d5605de19b49380-3ece98@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-52304-202212152216134f3d5605de19b49380-3eCe98@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 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 Thu Dec 15 22:16:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 2330 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 23:16:21 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wr1-f62.google.com (mail-wr1-f62.google.com [209.85.221.62]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 2BFMGKSV013486 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Dec 2022 23:16:20 +0100 Received: by mail-wr1-f62.google.com with SMTP id m24-20020adfa3d8000000b00242168ce9d1sf94338wrb.15; Thu, 15 Dec 2022 14:16:20 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1671142575; cv=pass; d=google.com; s=arc-20160816; b=i6fzuAfVNqP2OIEHFK0jjdHVFNNZsWFsZk6nh+O2LXQrKqrDkQsc2p3UTYsJG8o1My L44wk/I0Xw+FZgMuY4v++TFjEjtzHzyNjk4nMt7tmon1OL5oI+rTi4da2TmhA/KXx4Zt hK9mcLpVAuPhht1mYwGFJ5puLAASIHxvPnisKzb5OjFGwLSvWVEgIlw+Ulx4iTAAtMNV QY4h5sXACMmCZVwajYAQwTgBtnE47M7fQMasQvk8IbIxYZ9MgZpdkW/m4VwevJ81Ks0Q DHfvYiY1qq9hKU6f9L5jCSP9Ot2CzApFN9XaVmg4wGHVlBIcSlnuja5+ZzW4wfADWB20 NY9g== 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=GHMyzznBMO5Z/Lqq8A2S2EROS9Du9pg23pRvZk82e5M=; b=EKn2zEJ3TybWZHhq5eN+e4c/xXmiSPM1mt3MgWAN7yrmsYpERmnT1Jnm8Ur5Q/YwnQ 3UBbIOhLI3YSDX7h3ltNYUJxp0BonG8Cp4PoNx/I0zzIJS0BSycdGj9Q01/MynvL6wGj qH5UEeXNoM5UGgtYmwsL/E9HmOkZiOh8JHGGtmsO6ncB9oVQwZYbDo+MXwHfUX+Snd7d e0H2ZXKK/Bnrqh0WWK5LpC9Yl1g9aDVrpz6VrYtek1xZmkcNFHHXgKWHxzRjkTvAsD7K CsgJZ5c57xCQcbbyjH6EQQe+vOX7ZrqTg2z5jyId5dhVl0dNP5/490fj+Upa6CY43bTX kqQw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=cysZtBbA; spf=pass (google.com: domain of fm-52304-20221215221614e43773c75192ee7c4d-yhsxdl@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-52304-20221215221614e43773c75192ee7c4d-YHSxDl@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=GHMyzznBMO5Z/Lqq8A2S2EROS9Du9pg23pRvZk82e5M=; b=fHs0jq5mc+8Hjy+bI7OdfddjAvm2nTOB4ynIFIpQbWcieiKcHlLRKHU4qbq57xmley ef8zG67M6uTM2sy2aVBNcQQdSpSIZDOc2EbBVHN7NOLPMAUGZtMcFzyM+uYSZVkBq+dU ufD421cXm9fUFUT/Gleb1wmPjqLHS93OUBmsBJ0jbi+etDM5BzcECI5NBiKs2ZEpn/Rr 8DJ9ce0wD16XnyK9lBnybHyM0EQENGRZxufXqxibfy7b3bvq1KO9L8tLSj+/GD+LTpUF 2xiSjsBbuzECHUxJCLSBlqPB1/xCvjbsf74RIZHmVw3k91siDqkng28cHr8aFtXCiT4M py7A== 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=GHMyzznBMO5Z/Lqq8A2S2EROS9Du9pg23pRvZk82e5M=; b=3ucn+4xMGZKTN9zNwvoa9mOiUhjbeiRZsvICXm4ZefnJPDzQsrHnvDERo8WwwRbIJb sSuZ72GPPpDRCP77bG//Al11T2jTsM0eLgv1bNFWu2pdz/z1lWMe5y3lpGY+nJqrlO/7 LmK0bfLMB0KxaV2J6K0vyp0yuWsAxklHrTSOGxIxxhkXgiWl1eXWpJRWrR9iQSDx8hEI PpSGO22qy69qSmKhIXB5fdsXucakM9Npq5jQwfhlpdinxKNL0NRRo6d42lcOYJVv1wSX VCrpX0NarnQvZdaq09iR5mxau2OF94ek8Rmej0g5fXw3nHsW2PRBmBNil3MzNA0IftYC 8OTw== Sender: isar-users@googlegroups.com X-Gm-Message-State: ANoB5pnYVm37S0yU690uLDnA19y6x7yqBbc/+nbFUIWMhG3UZ76O2HEr MO0vTyRoR8SYDfLB/LV3UHA= X-Google-Smtp-Source: AA0mqf7PZxpMEuZMC1H5+mNq/zFnJx4ErqmEmRnKwQz0StresApzBADevXKNYwZPD4oKLVNhjnsHtQ== X-Received: by 2002:adf:f54d:0:b0:242:9e6:ea4d with SMTP id j13-20020adff54d000000b0024209e6ea4dmr34796525wrp.251.1671142575318; Thu, 15 Dec 2022 14:16:15 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:c444:0:b0:3d2:2f88:9ec7 with SMTP id l4-20020a7bc444000000b003d22f889ec7ls256269wmi.3.-pod-control-gmail; Thu, 15 Dec 2022 14:16:14 -0800 (PST) X-Received: by 2002:a05:600c:3b84:b0:3cf:8762:22c2 with SMTP id n4-20020a05600c3b8400b003cf876222c2mr23982524wms.38.1671142574372; Thu, 15 Dec 2022 14:16:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671142574; cv=none; d=google.com; s=arc-20160816; b=u9ZJrNPlWOVn7HujqVE8OOUVfrpGHsrLiaJMZd8+8UiYTz5MxrsKq7iM2YoQYXd84Q 97+2qYW3UTA36lWgZR0Hr9+sxBBwmQAE+1JOTqYXpPfHUUJ1v13qTN+2aXBx7rH6OHuA vYlxJxRXnvszfTRMBdi4of40HfcRpYTPqrOv9YC6E2rOw4+DYjcd9YQ7Tl6rCGNn8ggH IaKhXNBfs7CdvMCV9sl0MoZDYYTM4QZlct/vJ2EB2Y/Au1enxDLO/3DUTKa1GVnk0ppW LtrMY+goG9+3SawEZvlE0Uz9FLh4t3xfMuWUGHX9Ra98WGE/E5H6RUZuEuCj+lv7RxNE wfug== 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=EH/OCg2HWQXODVWaLBH4gJbgomqTyCTAF1rndGkO4TgRiEuT6zVK0Wjpac8NBjSdSo XN05GvWSx3Un+kIC12ryt2wd6ljcjjqZo6uEulqY7lutNbC/Ld+QxTFPlXrx1tH/0qYE TB1zLUBf6IYmw7CNpuyTF+1fctRYaXYsihfNPQZOl/BnmCe8Nwb0G9xmQyw73xSp7Y3f VCMxxGPhmqYMxfmfDRXs8lVYqLS0dqqfesvhdZq+7oe6aGo0+sIvgPj9/4H7HofVCrhe f0IJ+b7KXCcL+VczQoG3GCCwGhXVv8lxKGJtIHrkZssYkW7FlelmcV+EsdYM2yHI6zrV XotQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=cysZtBbA; spf=pass (google.com: domain of fm-52304-20221215221614e43773c75192ee7c4d-yhsxdl@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-52304-20221215221614e43773c75192ee7c4d-YHSxDl@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 m65-20020a1ca344000000b003d1d8d3577dsi541944wme.2.2022.12.15.14.16.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Dec 2022 14:16:14 -0800 (PST) Received-SPF: pass (google.com: domain of fm-52304-20221215221614e43773c75192ee7c4d-yhsxdl@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 20221215221614e43773c75192ee7c4d for ; Thu, 15 Dec 2022 23:16:14 +0100 From: henning.schild@siemens.com To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH v6 3/6] meta-isar: introduce an example to use btrfs Date: Thu, 15 Dec 2022 23:16:03 +0100 Message-Id: <20221215221606.5623-4-henning.schild@siemens.com> In-Reply-To: <20221215221606.5623-1-henning.schild@siemens.com> References: <20221215221606.5623-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=cysZtBbA; spf=pass (google.com: domain of fm-52304-20221215221614e43773c75192ee7c4d-yhsxdl@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-52304-20221215221614e43773c75192ee7c4d-YHSxDl@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 22:16:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 2331 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 23:16:21 +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 2BFMGKPA013489 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Dec 2022 23:16:21 +0100 Received: by mail-wm1-f63.google.com with SMTP id t24-20020a1c7718000000b003d1fd0b866fsf146657wmi.3; Thu, 15 Dec 2022 14:16:21 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1671142575; cv=pass; d=google.com; s=arc-20160816; b=djRjBadap/qAzgwd38MDaKlCFOqYhPwTejzyqT19+hUgM/qDBXrVDPzpLjs8SydeFR o8og8+s6USjGIdKWYZ64gbVdLIJRP6amr+nK/ig300/r9+yqQpfrUx+xKLUGj4ZF5nmV uKtT9YSnNFjpD7S+sGHsXS+HHZ69twdRStTYC+vuclG99FrmgCqa6q2hHi+iheilLXl2 kvKTEMGqTvebDYWk5xRXgK/cpLvPVW8AZ4ej7BsSrsNCtRz8/tkaVS6WLhyry6EuRF3J N8hr/AAlRCyp9oIfwuhcKfbAVaX6HLrQG8sltpSOq5V44voMFdVZ6X/1fP4IFO8em4tB Ur+A== 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=MjPGvorNw33BwDvteNT/SQuBKIO+HOHFeyPsk7YgHo8=; b=zPqgTwt4aLFeWmrJLQYlutdklK5p35031BMGWD9rQ2d+YUip36hjIAjQcnfyHerTaS RZHQdz2ensrZeXuA0I5pNqPRNXtkokcqMoplnmMvNARdpQPAd3yW6FYlRdyM1bFpWygs nrB5B+epUuCxARjqFxXVWSJ5sH01OkJ6RYE099Ma2wkb0YHzco6tdJetejSt2JRHTJfV zROCaVH/QDtbeD5Qoj+fnSQZueOm1oM2tUumBQYwxNI3QOWBHu2cfrCRjndOfuym/cdS +mk6gyLQpxuMmr9JiLstSNkdtBrGJnjnzrNhoJvvy26eXHf60Cv3snL03uMEKwwJRyoH GgqQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=bXv4JB0M; spf=pass (google.com: domain of fm-52304-20221215221614c8f4dd9c35ac8d8ef7-8irahk@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-52304-20221215221614c8f4dd9c35ac8d8ef7-8IRAHk@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=MjPGvorNw33BwDvteNT/SQuBKIO+HOHFeyPsk7YgHo8=; b=p6aoSsRxW28Q3Mgq14oHsMZ0b4CG6mY+JwR7XOstyiJUnyMxDX7YKBqKhe/f9JZTH9 rK+in2jxMjKEqix5bNexiGx7lpQmCCsWC1tK8cEsHJivU8qnPdYQ3oKad0PwRUFOffG6 +aDjpJS8tV9QK7KbgRx4jsNfmvf6Gp5gki4DSB+ymTJPT3E9Q4OZA87RLQSoggOiKAU+ Z69U0+ZnIJy/mkYA1IqAH/Hq6NP2Ef2EmNdzmoG9FTnS5j7HpUN+GzOzPjCDhhlTckfX ZZPTepHVVqsFLyrPdAW5en39xzT1DdcHIUIInTaMOmlzbr5Os4+H7pdUg/hCsNTCOn42 7MWA== 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=MjPGvorNw33BwDvteNT/SQuBKIO+HOHFeyPsk7YgHo8=; b=LwbqkwFBmCd+Fsbu121dWlvXij3g9m6bvahKtcgb+TtwCCa1u9XbG0euS/T9Yp1nWl NwpiuGy9FJeyJO5lCv8wi4Cyjlicv6DeHfm/NoSdOHsOCEPc1yAwQA4IDLJ2ky/VGxaT c5DikPZDkjp3EJ7Aj271PwABLQgXe8pyyvK7cJ3Jl5lCh+pdCSOez1/VpuZ4dahep+5q P5qTJZ8hOw7sJbUDlPUAHu4IwpCTMZhr3J2PiQZvdSqRqJDNXDuavDFcLLRFyUFiVz1I NlBOLwn4lFEb/wH0Mawc5KLp7gH1CxAXT4HF3MckY2SqeUZ7kvKjrfg2cs6qddnvaQmK 8cSw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AFqh2koyAuBCv9bijRSPzreygolUKvd5/06kc9DuIkXOKy2COAV22PUU uv0nXbsQpOlNM2y26EvmEuo= X-Google-Smtp-Source: AMrXdXv/meEhf1fUAE5CWazXIGSkLcmMODn12z8qoApOZLmWrAmaqp+wgabQszfvQ4WjEwcI/4qtig== X-Received: by 2002:a05:600c:17c5:b0:3cf:7dc1:f432 with SMTP id y5-20020a05600c17c500b003cf7dc1f432mr206803wmo.148.1671142575683; Thu, 15 Dec 2022 14:16:15 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:230:b0:242:2700:8318 with SMTP id l16-20020a056000023000b0024227008318ls763052wrz.0.-pod-prod-gmail; Thu, 15 Dec 2022 14:16:14 -0800 (PST) X-Received: by 2002:a5d:6ad1:0:b0:242:45e7:db25 with SMTP id u17-20020a5d6ad1000000b0024245e7db25mr19332287wrw.37.1671142574890; Thu, 15 Dec 2022 14:16:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671142574; cv=none; d=google.com; s=arc-20160816; b=DGDHFfbWdjQaC8nrLYCQ043Zv44JkWiVzBm0LEVRpEJLQZVS46p7dCoB2Havx0lMS5 MZp+b6BB4zoaORpjV2Ngu5RO31U4i+I9f92eSYFiALLsAmB1tsZJQzodwv59RjhXWHZ6 BiA/2ea4i5YLYqBdO+xegsSfs7Jv+42JSh1WTC/oItbeTcl0G3m+hNm/8ulyUvCwFOMt nfOSeSjfNJjtHZbtEoEYHxi1I+ytK/Pf5LjfiIw21KfoXjsUS0vW9xCVFonRb+Du8PMu 5BcqIHtgdSY1gogezq6UGxrccvtrF86wj15brJTI3RwMzyqhISs0BCS/M100XlRevnAf vy+A== 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=BQwaSNugAZ5BzhjoMdyIymCUN8JhfsnGjQPlxKPMh4/5kLbth76pL2RlKrtyaHbWma bLrZXNiQXgSOLYpXV3arvHuqTel5RfJbLbGBkhRJFwynDWyoqE/QdTqfSWJlOZcT8HiH +rZl8Vs/00J/TU1gMzhnIhrYIdBqBH8m71Uy9h5LX9BVozX2Mq4zv3mi2GSgMj+Vuk4q AKHx+LV3dMQsDGh63EQSoHlreYfhjliXvXHDYt4pSmBHY3x7VjncOn/suycAffQTUaWE hHI2GbUjqabuaC4O+zX+MgGYO71WuxwWl3Jna19k9uiIY3/WQhAa67/vkpIvYxiHL8wQ QT8A== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=bXv4JB0M; spf=pass (google.com: domain of fm-52304-20221215221614c8f4dd9c35ac8d8ef7-8irahk@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-52304-20221215221614c8f4dd9c35ac8d8ef7-8IRAHk@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id cy4-20020a056000400400b0025664a2d85bsi27933wrb.1.2022.12.15.14.16.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Dec 2022 14:16:14 -0800 (PST) Received-SPF: pass (google.com: domain of fm-52304-20221215221614c8f4dd9c35ac8d8ef7-8irahk@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20221215221614c8f4dd9c35ac8d8ef7 for ; Thu, 15 Dec 2022 23:16:14 +0100 From: henning.schild@siemens.com To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH v6 4/6] CI: improve cibuilder readability Date: Thu, 15 Dec 2022 23:16:04 +0100 Message-Id: <20221215221606.5623-5-henning.schild@siemens.com> In-Reply-To: <20221215221606.5623-1-henning.schild@siemens.com> References: <20221215221606.5623-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=bXv4JB0M; spf=pass (google.com: domain of fm-52304-20221215221614c8f4dd9c35ac8d8ef7-8irahk@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-52304-20221215221614c8f4dd9c35ac8d8ef7-8IRAHk@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 22:16:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 2332 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 23:16:21 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f56.google.com (mail-wm1-f56.google.com [209.85.128.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 2BFMGLrh013492 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Dec 2022 23:16:21 +0100 Received: by mail-wm1-f56.google.com with SMTP id q21-20020a7bce95000000b003d236c91639sf136298wmj.8; Thu, 15 Dec 2022 14:16:21 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1671142575; cv=pass; d=google.com; s=arc-20160816; b=nMXqZAap8eEjvhWl0FblnuL3H6EvOtT4Akkk1kV0e2+y7F0M0FMBOqjU0dd1JuJLEu zIThfNg+flpc9nYswf+jA7D5qU/ts7UH87BiHcYsMPChujynxHvQ0AfLuLLik1+ORqvF NGDYnc4dSnmlwG9drsOWYtdXP879Yof58DZry1BRos9+XV6osdbLTs9HJl7oeH5mmMHL 1RPD+UbpF0FnyY1dQYtT++Wvu/2g86/0NRZSUbr2kbx6A3NbL2n1/LeHHJCGOOJ1SDOk e6CucmA2ypqCFdjpJCjEnEiNg8QuoTbjkH3bu57UAO643/V7I0Md1IBjgncBjIAb1eKn +bSQ== 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=21ls7qInyCOqCtfqF48VxArP+giK0d3uqdkkOvzri8w=; b=YzTq92gpe69h844klRHi4cskbOJ3iA3vtKr4AYHMwDfhEi5hLxCSNhTfg4Ff9QTA4/ JSjG8zfkVyz1XOTTTwcYiBUH+APATT4Y0pEayl++B2SHY1DembKr3AGWD45CobxkLVvx hcYCWFnIWcQjlDe+TkfEV/OFDYk94W/1Sxb21h+VhcWCXo6rrewbJ5X4YDYN/j/67uhE M9Ss3nAlZiqtv1/TZU+z90FbBSnDKrtNuT8zaUaFpLKIYI8q010A4u2vXv9+QucspFHX kpfiC29IpHRcW1a9NOOtYKoJy5Z9KYc8gJSbw1YxNiQZJ3cHrDz/D4M2fs02rSMEOJOv 7WlA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=nulNtQE0; spf=pass (google.com: domain of fm-52304-20221215221614e44559465ed36139ec-pwmfmj@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-52304-20221215221614e44559465ed36139ec-PWMFmj@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=21ls7qInyCOqCtfqF48VxArP+giK0d3uqdkkOvzri8w=; b=CvCzbIe9ficuedanypBpj9yUSGuGuNqbo60TuR27+zPWP8kNoGv9Hvx2DaDcqTzFbv OMDc4/h1uUG9Cizepv9mUHZzSHplu+iQs9RFJeEe/XUA3y71eyqUy03hP+P8C3dsuzMB YJE+kKwoNemiP4hqN3BKpq3MuDwyzwVDi9oFnV9aV9/AQhSAFg2YtZvrnGzw1EDl3Dvx Gb2L9YCs0Ct2io8Mkk7QnOua8mx5eUpyiawdif7JWUj2d7a/OpBiDGB5JbOZVa6wiqTA nTdjZsc9i6YNTLQChg3PtCC5sgNBm+JL7IcVigQqyQbYME75jQGTjwK/FWVUx3b3BAFG uKuw== 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=21ls7qInyCOqCtfqF48VxArP+giK0d3uqdkkOvzri8w=; b=hr60kkKH0Pc7Z2ljusl7ZGBBQnhLl1vxOOMJ6OQSFihkOtkdN8NlVRMbY/F9w1Rw46 /GHy8Qf1DWehmUoERlfS1TS9GbfFGuTXLF8w1pE8PbOfJxJ96Q5vUjAby0lvymega3gg jXEHTQNwaBflL19bvVzx+77rKz9CCzyjJnj2JAIrufldpKNu1JNV3H0BXQUbsajIIMr/ UQuPEXvDgUzbNU8cnM5O96/IQSmmLw0exRSm3y3wJO8NmMFCAq7M5YgQ/UoO/n/rZV7x 6GpQUem+ueRZWu5BCDHSMfaxbfOoA9ZWe3tfh/I5RYH10+0tM4t8r0KbU3VctF8bSN8I kgQA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AFqh2kpA/ZmdYFgEtAnF30WvoAJUXLe+3TC/Rav0c6cpynnK0c7tC5sY hlxx4AgtUXO8wz22JFvvjPs= X-Google-Smtp-Source: AMrXdXsBkmXnWHbNwpRcodLuJJBLLEQdM18/k8QHSgZAO6OibrZk3qolsTYyVOz+SMGO5W7Hzg68mw== X-Received: by 2002:a05:600c:b52:b0:3cf:59c9:4a4e with SMTP id k18-20020a05600c0b5200b003cf59c94a4emr226245wmr.17.1671142575887; Thu, 15 Dec 2022 14:16:15 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:230:b0:242:2700:8318 with SMTP id l16-20020a056000023000b0024227008318ls763061wrz.0.-pod-prod-gmail; Thu, 15 Dec 2022 14:16:15 -0800 (PST) X-Received: by 2002:a5d:6091:0:b0:242:2088:1546 with SMTP id w17-20020a5d6091000000b0024220881546mr24108367wrt.61.1671142575013; Thu, 15 Dec 2022 14:16:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671142574; cv=none; d=google.com; s=arc-20160816; b=dVLdVyiUIl9a7JUu5hGFAHQNVCR0CKj28SkJL9t0U2De078BgK+a0pWBZdBJzcKuCu n3xYs/i7yxjwqaSjrTItgn1ei0302MNY1LODF4g7+nYEJeCu0VppREODt19k1FrY2RwR Pw85kKtdpmmfImy4IhurRALHnldTr7x+IDihVZumFq+HE+ZTRpJdLLCiOH25zTq9l957 eEdEYceSqLv5luZ2ccLDqejFXwybAISVcauHdnXcamHtLYes5cxsMscR1CXgMRCq2L3a C8eJeW1KSXsGFzgwTXT2GGvGT9ofSPDruZbvcKuM7f3OlQZAkTfGZUYJW7dYdexvpJNd dOFA== 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=vnNWtqsyQbQXA/LyVS6PWtzud9Qf3iSCrprBRpkpxUnA8MFuVk6blLBGTjUgvLhSj6 NNV+e58F2ihq7AB4ogeagpxhFyaUc+YV9vQQzn+pEK00eP11W30xEJrs6MtFLoq/4EgU L9NEZMkia+3yady1iMlj7YA/z93B5alPi6EsXpTWdNX/G1XPxka/DugrauBJEiVLaONz tIXgdEvjJNob09UXeq9drnqllyqBQb2AR31fJ1OYbW1DptgqcN8hNgiuSEN3lM8CtkYP dYVusoTTWJyGuOemmIxRS0wpw3pbc3G/KmI8rlNomSDCuopDTwaR6PsxJftXTqd6l0Ff MSSw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=nulNtQE0; spf=pass (google.com: domain of fm-52304-20221215221614e44559465ed36139ec-pwmfmj@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-52304-20221215221614e44559465ed36139ec-PWMFmj@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id cy4-20020a056000400400b0025664a2d85bsi27933wrb.1.2022.12.15.14.16.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Dec 2022 14:16:14 -0800 (PST) Received-SPF: pass (google.com: domain of fm-52304-20221215221614e44559465ed36139ec-pwmfmj@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20221215221614e44559465ed36139ec for ; Thu, 15 Dec 2022 23:16:14 +0100 From: henning.schild@siemens.com To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH v6 5/6] meta-isar: install expand-on-first-boot in most images and add space Date: Thu, 15 Dec 2022 23:16:05 +0100 Message-Id: <20221215221606.5623-6-henning.schild@siemens.com> In-Reply-To: <20221215221606.5623-1-henning.schild@siemens.com> References: <20221215221606.5623-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=nulNtQE0; spf=pass (google.com: domain of fm-52304-20221215221614e44559465ed36139ec-pwmfmj@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-52304-20221215221614e44559465ed36139ec-PWMFmj@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 22:16:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 2333 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 23:16:22 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f64.google.com (mail-wm1-f64.google.com [209.85.128.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 2BFMGLFM013496 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Dec 2022 23:16:21 +0100 Received: by mail-wm1-f64.google.com with SMTP id c187-20020a1c35c4000000b003cfee3c91cdsf306359wma.6; Thu, 15 Dec 2022 14:16:21 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1671142576; cv=pass; d=google.com; s=arc-20160816; b=r3W1DF6VPSocOoGaoRldIs9Q+qSJgqncffrCChtbZeabbA/rvc+PBsFkt269H6IMuy rVf1QvgPKPd6VpzlhUBe31FswRmeFFcSA2wbwBqosBcqUftGX9gtgPCmQrYkolvxG5Zu wmU9Ui+IfEIXEkADByY9qS+L+u+avZn5mopxocYS/9zKvq+E/h9w1lIgBriqUYKAvSAK 7HHjs1xrPWqiWCQCqIz5J02A4ZM+JGVmKN3IG2YD4kjvTJKETLdi8FzRTBvUIgwfhwu2 YzAfBOsRm0zfCpYVmqk2Ks27wZGcvab5evb/OtF+e1N4QJD9nWcJz8pxfwFFLYZkWT/z nPvg== 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=KwXDRCd6ZMP7/t63DnXlwR4itl6qfZmCI52LGrPn5b0=; b=NxrI6U05F8dKIIZ/t5zMmYj8Cc/0JamQ8KEAABEwfrOQHT3L6hZy2IbFfLfISATaTp 0yLOpt3xBcmyz3PFnLLJuouvQ3Ry+A1bZiNZ9M3mvgDlAjtMy8vTnumihbA1vh7eUYH3 ljGtveFoiqoOEKN3SANUlUDVgesgQnJrQ4HrjZq+6zalm+Dew1/6e7nhTSBrYzAQF4DG 6123uuxA8GcfUvhfV+B+0eGIyTQX/Q1nrlyMxcfW1tYQT2MkiOXLuoC+V/y82KUOtWeQ xwAbrJgFwXrRnhgmYOFUmccz1v7YAmga9V3ALpOFXGl7na36hDXXWyU03gK7HrXNZE1A qm0A== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=CevMxgnp; spf=pass (google.com: domain of fm-52304-202212152216153e5e56d1f509eb0a52-eqksqh@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-52304-202212152216153e5e56d1f509eb0a52-EqksqH@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=KwXDRCd6ZMP7/t63DnXlwR4itl6qfZmCI52LGrPn5b0=; b=Hh4JZdCXCVLgHM3hB+DlciC6XLO1nqJstzZBDUz5nleYJUr17Pdheqt8k/+mAWaSUm jvM5qqqx2G/NSSv50kCSAbD/C7/Ca1fzl8hHk/B2drzydM7QxLWk0xhA7Y4M2LYQj3Ro ip/JahJOoyijx9o7mZWd+F/GTRXWVTITPeIOUY8JzaV5WskT8N79H/yma++JbmME03cd Za1xfwiBJH/6nP/3sTCHhLr5HKuiKAb0/ke0PlSwoelAs6tKHDv91dFsjU1Y3gHMv/oI ZuZ0oDDwf3AI42/WTNsWKVazwNOWLeCDdL0u9YI5I4WdIpNn7yU1jF4EUIvdRfNI7FeN WuPw== 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=KwXDRCd6ZMP7/t63DnXlwR4itl6qfZmCI52LGrPn5b0=; b=mpI+3IOfUuYdKt5u32WegYtTgmqa0LRVsIn7iFC8qaE6AnXp6leeb1Cf7F+zrya3Au OeiM2H++tC53FhYmkrjplo7Co5vFQBBhL9O/aVDXEk+c5hC+d0gLd3GVINWDyDxmoIh5 D2dPRy0zw+o6Dyx0ymIA+9o17mqCuHEABuEj/Qn8NsFLX86iRpKy+kOD/4RabOfEuP8l VFMOuqMMQCh0IwG+yEEVrIUXpyudol8dUoERK4ZQTZMBsN4gccXBsf5JGdMs5xS1M7Sd dPjUpWUp/0YSw10UYICZJXHV4rnLO6Oco0IKB5ZIdLYVzi23b52H2CPxbs3kfFxwDPf1 icgg== Sender: isar-users@googlegroups.com X-Gm-Message-State: ANoB5pkj6RzVzH9zxaPqZdognzC7FKuUDMjqnCN4eD397w6eaccRCl0k Jl63E3b2HqcoxHtVJ3ffcPM= X-Google-Smtp-Source: AA0mqf6CtLT338XNGE8iD3DV1DxUi2RF3lIc51V3af5Qqy6ddvycqvNBCDBxGygYrjvvwrRaUp4J1A== X-Received: by 2002:a05:600c:4e10:b0:3cf:a258:99b with SMTP id b16-20020a05600c4e1000b003cfa258099bmr431768wmq.34.1671142576489; Thu, 15 Dec 2022 14:16:16 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:c444:0:b0:3d2:2f88:9ec7 with SMTP id l4-20020a7bc444000000b003d22f889ec7ls256287wmi.3.-pod-control-gmail; Thu, 15 Dec 2022 14:16:15 -0800 (PST) X-Received: by 2002:a05:600c:4fd0:b0:3d1:c0a1:4804 with SMTP id o16-20020a05600c4fd000b003d1c0a14804mr23803226wmq.17.1671142575662; Thu, 15 Dec 2022 14:16:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671142575; cv=none; d=google.com; s=arc-20160816; b=0yi/xr4UWl08DHa5w1fd9MzFQlvyjpckoRp9EAkNySuu8EBgHeU6H90Am4UKTlr9gt nnT7HGEuqRQvAxySBw89fUeY4aB7JkB1zXWrLCuSovxjcyYTjUNDF30+/1uWuUtpCuUO e5OAqYFC5hfyc0umX6sfTeKcpwGl0plWX1rWvZtvF6oX52K/VhzZB0snfwayLIVz8MO3 H5oac/MoJCnrZBPh9kU+7JLt3inOdlhmtDrsP8balzkq5vbvEOtCorZqVaPzBWQ5fvOQ UH3kdxSfqj3rwRNEK7HePUN55MGLCD+D5YftH7LPkWkIa36CFGPM3mJ/cCVCAWy/aWVL SVjw== 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=qp3YGu+5wUC9NlwhSi6EMmovwnm11tNyNKUJngm2ZoQ2+8A6j9t2fjF/eSfLw4CABB To4RXaciC4BfFbRpEN723w/y7jmRgehCTo1A48PO7Xv8EsHpnJ9R/hCctA+0gp+tzzA5 Z/wW8togxb2qQ2bUDcI+yylv7JW5tE1yk8w2lWgAh/W9tWn9x4LmyDEHwY2MI5CN0pkG KD3GHZW1NVmtqUdH0DgkcyUhcSuya0ZYx9oTOUSf+WZz6Nem1p/ya4dJxcGVcvqnKzgW 4/zQBOYXaAuj9BUsWVa8Wi21E8OZ4nYYc1b5v5fXuTmvUUG3BFDVmwDhiMlLE/yUhEIT Jogw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=CevMxgnp; spf=pass (google.com: domain of fm-52304-202212152216153e5e56d1f509eb0a52-eqksqh@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-52304-202212152216153e5e56d1f509eb0a52-EqksqH@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 m65-20020a1ca344000000b003d1d8d3577dsi541944wme.2.2022.12.15.14.16.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Dec 2022 14:16:15 -0800 (PST) Received-SPF: pass (google.com: domain of fm-52304-202212152216153e5e56d1f509eb0a52-eqksqh@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 202212152216153e5e56d1f509eb0a52 for ; Thu, 15 Dec 2022 23:16:15 +0100 From: henning.schild@siemens.com To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH v6 6/6] CI: expect a message about filesystem resize vom expand script Date: Thu, 15 Dec 2022 23:16:06 +0100 Message-Id: <20221215221606.5623-7-henning.schild@siemens.com> In-Reply-To: <20221215221606.5623-1-henning.schild@siemens.com> References: <20221215221606.5623-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=CevMxgnp; spf=pass (google.com: domain of fm-52304-202212152216153e5e56d1f509eb0a52-eqksqh@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-52304-202212152216153e5e56d1f509eb0a52-EqksqH@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)