From patchwork Tue Dec 13 10:15: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: 2291 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 13 Dec 2022 11:15:18 +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 2BDAFIIb000507 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 13 Dec 2022 11:15:18 +0100 Received: by mail-wm1-f59.google.com with SMTP id p14-20020a05600c204e00b003cf4cce4da5sf2837984wmg.0; Tue, 13 Dec 2022 02:15:18 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1670926513; cv=pass; d=google.com; s=arc-20160816; b=Q3kWRlqpMrCOxEPbYQCkWFldh+eAG0Aiyj59/SBBl93HaJCD8B6ya7JPYmcF/gAoIw W+vFnwMzPWHr8A9DgAHgjDg3npO2IlNCWsZj49uMop6oHUPp3mjgmE5B/ScHu/L+Qx7k pdRNFKecuO63I/jmC81afjm9S5zIjcsHMgyxb6ZPvSNo8SFs7sOK0Sbjz1GIa5pMnbCj mhxMhNSI5HBOyu8/B2fL8leqlHHhvi/VTOkrDKtxbgvkQWEbJyJE6Psyvk1tTYFpabnF spuog+mrmpcyh04X1hlm3F5vWkB3JndJe1ZqJCD8ULElzkgyly8gbt7eyCA/baLQ8YXL eNYQ== 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=3UltL8AMx3wNnRx1pckQOmjlmqeegawVx8aSiMfQ4LU=; b=TViRqpbBnGzPFrjbRt9J+HKsMPH2bE/HVoRiUzjmiBXz9jIRw6CL2VIuQ7K++7odzf bdX5GU2tYz29yZGwgrzf88Ile+7R/jzdvToZ/66i3ZKHQIEGrILayeFKHXMPXiWYYZS3 5EJpLzifZY0R94n0DR/bJZmAkLtD1oB6WY3e8PgR1UftTHMHcbd6tLCeo4vz162yj5Lq tSa1nDB86Urlbxm/zpogF9G5fgCn7DlnbWVNbdZQW249Mab0UfiOvBrZzlU65LL2aRpj IN7Ox9Hc1ehR2ZQDbs7O3BHIkYeNbg2fXO3IT//DkRVXm6pa0Qjq/mkMB7i28O5uRUFN x3Ng== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=TIoOdMu2; spf=pass (google.com: domain of fm-52304-202212131015112530f8d069e3fa504a-pqiosz@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-52304-202212131015112530f8d069e3fa504a-PqIOSZ@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=3UltL8AMx3wNnRx1pckQOmjlmqeegawVx8aSiMfQ4LU=; b=HbAhZ3Ki8cbEGQ0AGIgfJ4rqvm6GDNNoyRB5WSIgz0wPXszzCRqwWAHsg4fPNFH6Q8 E6z0o0bIlBQLFTXnXLsOaVU/2KLKqNdQ1oElRCOaGdiRHQC26ZS5Ksnn0ynR0L1Dl+2G Zofs/ifmNXqpZx7HWwVzhce2Y35fgJ1KR2T5hdta+hD0460SvKcZavIIsKZO912UYfn3 +dLDyycnR+OU0sEenlWiO7SvaDXmhpoBiEtTCIC8d5Art0rrtNUhI90zRqOLtmulMsR3 aAMQ+jpmRO3afrBFhQ6SpRkyJkcwP1m6wpgxecmgxgk8BqEV041/FzniYz1kiONeoia1 2VhA== 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=3UltL8AMx3wNnRx1pckQOmjlmqeegawVx8aSiMfQ4LU=; b=7gSFhtSkrCz6N67SC/0AzArbk9wWLvpP0NMPcNyTuJjFCcbFRMCGb6fEOeFV5nkKbm AE23kYFhY2v5U5CF3uj5CsCTdF9dQXnjhvjjzG8z527Lyynx2lsx3h+SUUx0IweE2z5d ehIzo8p7mooP+2T8odpoIQnMHukh214zIVu11FMEv8ej7QBeswZRlZvJo2h6dt0M/VEg PA81McF6CSqaxuGjNVfNfK2VT9g8rTpwcNUF7Fod7tycuCR2EMOt7PyLsyUgqEPal3Cu qAOxzX1WWul14cr6ka/D381KAoWa9iRQ21zdRBkfOAd78JRzDNQVmFNmvAHq3sZ/7KPk LxcQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: ANoB5pkxmvPRl3n/WNC5EmO/9fG6qTZJ78SKEKpD4bpwN/Smv/HmFeHL LbvqU7E0VbilnxdRvC360+E= X-Google-Smtp-Source: AA0mqf6rJ8VF76DvuoBjWslvUeS5mQZlFTjBFXT40K7amvUxJbJplXX2OcJqk+46e+T8OnkvVDcI0Q== X-Received: by 2002:a05:600c:3d0c:b0:3d0:58bb:9fa3 with SMTP id bh12-20020a05600c3d0c00b003d058bb9fa3mr162577wmb.39.1670926512873; Tue, 13 Dec 2022 02:15:12 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:2253:b0:3c6:c1ff:1fd with SMTP id a19-20020a05600c225300b003c6c1ff01fdls11775526wmm.2.-pod-canary-gmail; Tue, 13 Dec 2022 02:15:11 -0800 (PST) X-Received: by 2002:a05:600c:a56:b0:3d1:d396:1adc with SMTP id c22-20020a05600c0a5600b003d1d3961adcmr18557304wmq.14.1670926511782; Tue, 13 Dec 2022 02:15:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670926511; cv=none; d=google.com; s=arc-20160816; b=otNyI+RVbnsxMEVzUolWlGynoBAjLV3XgAM7rK9LodWZtGr8JYbMbe9snzJRqPSisl t7lIslgrxpPlUmO9+E3IDHJvfqiqeXkkkeDA1Lvyye1/Ox99CEdNOh4kvJ6TeyCwYLXn E5MOJ3Z9f/IvsslMDdB/8R9qfQU75PDSeLkHYUsLuvlpNpIM6wdJVA5Bgw2nBaROU959 34OW9ta7QEcznXT/pq15w+kJt1DIxUuOI6TH3mNu5N65wgGAmB7xb1VGayIoOQFIuu5Y wo+qOwdPrEUmorL3nwBQ0vm/DJq8iIChObJFdK7Bqoco0B4PRd4ndlSWTMhnKsThaAAo 0kVQ== 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=3jP+xrxBxK7yuAuJvhclhXaksCs+GNPiO4SSMXoRomU=; b=Au9pwrmL7BIT0MD7DKUdxxA1UBLZi0rdx32+Yw6Q1SItr3JuNJhnW7JKf/kYM3IbQd 1OLgFn4Ic3Uw1IXxC/q23MFtnRDhOnPyxM//Dynfn4d6IqV6/UzZJI2E9eWCevivyuMS 8Ih+8r3Rb2oLPmgNRH/x08GVddh+rnNSyK2dO5MhydHY5Ps8Y9hwGLLYkHr3BeTQXZi/ j+aaZoMi9C26WUW9j7KTeFY3KRyVCG65SZwj0Mv3fcdIy+XcjRJ1uiY4JO5suICRwW0L YT+uKfV3TzJBccnTlEhrGk3oIG/crs9k0BSnQz91lPcPc52qqXyqJDBlcZqNsPCssuam zTfA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=TIoOdMu2; spf=pass (google.com: domain of fm-52304-202212131015112530f8d069e3fa504a-pqiosz@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-52304-202212131015112530f8d069e3fa504a-PqIOSZ@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id j4-20020a05600c42c400b003d2051f87ffsi590009wme.2.2022.12.13.02.15.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Dec 2022 02:15:11 -0800 (PST) Received-SPF: pass (google.com: domain of fm-52304-202212131015112530f8d069e3fa504a-pqiosz@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 202212131015112530f8d069e3fa504a for ; Tue, 13 Dec 2022 11:15:11 +0100 From: henning.schild@siemens.com To: isar-users@googlegroups.com Cc: felix.moessbauer@siemens.com, "Roberto A . Foglietta" , Joe MacDonald , Henning Schild , Joe MacDonald Subject: [PATCH v4 1/5] expand-on-first-boot: support resizing a btrfs Date: Tue, 13 Dec 2022 11:15:05 +0100 Message-Id: <20221213101509.535-2-henning.schild@siemens.com> In-Reply-To: <20221213101509.535-1-henning.schild@siemens.com> References: <20221213101509.535-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=TIoOdMu2; spf=pass (google.com: domain of fm-52304-202212131015112530f8d069e3fa504a-pqiosz@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-52304-202212131015112530f8d069e3fa504a-PqIOSZ@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: Roberto A. Foglietta Suggested-by: Joe MacDonald Signed-off-by: Henning Schild --- .../files/expand-last-partition.sh | 35 ++++++++++++++++--- 1 file changed, 31 insertions(+), 4 deletions(-) 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..0bc686059718 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 -p "" "$(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 Tue Dec 13 10:15: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: 2294 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 13 Dec 2022 11:15:19 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f62.google.com (mail-lf1-f62.google.com [209.85.167.62]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 2BDAFItx000514 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 13 Dec 2022 11:15:18 +0100 Received: by mail-lf1-f62.google.com with SMTP id l15-20020a056512110f00b004b6fe4513b7sf454359lfg.23; Tue, 13 Dec 2022 02:15:18 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1670926513; cv=pass; d=google.com; s=arc-20160816; b=kbz86JJp7YWrDL2zERFknzySxZkuiJgtIT/W2cJAqWKMx7PD2gucraQ440t2O1IX6+ 2cFVj4aIgyQuGN6vGb0/zzCXccozRVeDPxL7vrW6mxV2K/J/Mn+K+m9jDQnPjuRt4/0y skvkm1utr8J4+ECMVYO/7gR2I40BBt++lTsJIbqrOi1/kszwe9qGF/ZBM61homNMyfr2 t+++HHexdee6eQ1tnktNknzuhTxuEQxw7qJ5PPkvfOV4AYWx45YyVsz6ZWST0uvm6O+j bPGD9TQoOP5ekY9dpcZYScMe0HUJHBJMKHfXhBmEhWeqdrdh7OKiQCSYyZeD1p6OwpMo L+Gg== 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=l2k7XutQRBkK2xAdsvBiSztBWHqkxguxgbyv7A5G/uE=; b=TJjOCklloSOdyyEIwel9RmlcifqeFRp0r/WWU6Ca8cRDVGQVQiKzI82v+nAQwIXdh0 USXX71DNBjdWDwhHEjdrS+ZxCwn8EDqxiQM/sNCbun9/l6t0Dp6tpeqOMlXUQJyY9R9T OOXXTPG0JXSJahJJkvrcQ3Y4dcGVK/hQxevU4AP33JocA8/MBNgGngUtix69kjPqKgry EJinqqbmWZ+Kv4r96aCSz+FO8qhzImxSoSSFGdnVkkQBrXVaih+RYc09EokBlTVp7gsx IWm4W4Fl6NEEg41Vb7wX/Zet+CRcgtYfEYZKBqp4Lz6xZRmmb/Su7RM3Q7D+LT/Uf8Kf 7bLw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=ltTQaYwu; spf=pass (google.com: domain of fm-52304-20221213101511d56bcf66890824e26f-i7o7fl@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-52304-20221213101511d56bcf66890824e26f-I7o7FL@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=l2k7XutQRBkK2xAdsvBiSztBWHqkxguxgbyv7A5G/uE=; b=BwctC3F/LqmokRdQDFh3a7F8noxBClh+h8Rf/hJwBDv5pE3jqrY1Vr2ygzJic6piaM id9hxNWOxQroJKJCRbugZvXY4Seo2vHe0TFsKWFya8dOsR15D59L4+rj9AwBkz/oTpKh 8SAeohgsXQ7r2FUbWwQjenRMG0gEe9q5OsaPKkLNuEhiurqvp/+NDgu9LaxX9IyLLZVi S4rNbACss9dFWo6kxlM46ocG4gvuucTWzOhmF2gGed+0sznQqIX33ZFgmQJ0k+B2W7Qf 113RYeQSxZonSQ3we7bdMG/E4I1Tk+BLH9upKLZ3a9cGqo60IFC8FiKFusHOhD78VxOg J43w== 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=l2k7XutQRBkK2xAdsvBiSztBWHqkxguxgbyv7A5G/uE=; b=JPsrnmk5qYo8VlouTxs1yvjg4nDwhFDJjFAjnOBDFnc3ZlS5r5r3mnG7AEP+ODAeAO 7iXeN1nfa/U05ZEqjQjIU1ZtcaLwHg9WC5F8k2PBPkq8IcCwhC9I1mUAb3vkySlf4kap wlz8NCq56zWrfJeUM6/5lcHuXsiahookdg028Ftkvm3R0r7nK5TCRXAZ702tdQTY6e/J 5IH3V/vGWRE06ZaIolcsFQZvJUmglVN1Q8qYqlYgYcsPGEboxZDuRlC1lZgmU4eR+2Xj QaQnYfjXyGhb6ScgIvX3Aaqn7Jo75nJg7tNo+TnGZZmbdbNKE4lZM9KLegOQ7aWtHtqj lJpg== Sender: isar-users@googlegroups.com X-Gm-Message-State: ANoB5plg0I+paH9rj6fWb4jAeCM2vPKZoNHQdUyO0isuBn7aB/BO28jE uwhI27omc23I7cFQHdJeAlg= X-Google-Smtp-Source: AA0mqf6QHxKlomb5Kn/ucGuH83cjWMvxahNzt2KzH+k7XLYB7aoOraV0h2V2pVvM0UDzs71iFQSFgA== X-Received: by 2002:ac2:5e29:0:b0:4b5:b109:4c4d with SMTP id o9-20020ac25e29000000b004b5b1094c4dmr1011965lfg.366.1670926512999; Tue, 13 Dec 2022 02:15:12 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:2012:b0:4a2:3951:eac8 with SMTP id a18-20020a056512201200b004a23951eac8ls2302250lfb.0.-pod-prod-gmail; Tue, 13 Dec 2022 02:15:11 -0800 (PST) X-Received: by 2002:a05:6512:e99:b0:4b5:adae:b6be with SMTP id bi25-20020a0565120e9900b004b5adaeb6bemr8254722lfb.42.1670926511846; Tue, 13 Dec 2022 02:15:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670926511; cv=none; d=google.com; s=arc-20160816; b=Myumt4nH6G8cixPQ7sFleZmpWqLFGL5sxTi0DhDYhzG88GmoUECuKOoQ57/8y4dgz5 Fp94OIJJbxlxMBLNPR0qtAbJ4R2Yprne9odZPrKO0clL3i1cpDAI/Fdu3vS482ZXAYQG cISH3+s8860W/dFieIZIJO8FBk5PXix7avruD7fDTUzLNb4ME4DSsplXo93jMucFBz2m T9MmERMB14Q7EF8Suz4Hj4ltRwccwgZk89LZgdm+Ro/AKcoSqXWAvPSP85L/W2yMCLRs aNHfCFNsNobC48H4h2h7b85Bzdy/cDujRDmCnjYDq38aL7UBbnQPSfWSjBgRimb7+6zC 1W1w== 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=oKi6s3M33AQcd/xkgqM+vmdlTxXOaOpbMtiAnkKj04ShBKFT782au0Vf94WrFFBbVh UxtyR424znDULQCBiXhL6g3aJ0rcMjQMwkoECmd1OzzLQDIrqa73Wp+J1FbdBomgV/ie y+ZXGGHJATTZhhruHfkDq8QmehgxpuyxNTzw2DIz8tG+2trGDHEAizUbVNi7yo88rIje PYKgaQX9XdWnoZMXJssnqlBwtiOuD4BwIhJthUVaT7Fn8ue0PL8iJw8L7AZ/Em+GjcID hU02Qy6L4DVWf4aK0HTlgFvEfPU/iLfTBq8puJTha9fbqe291yqalBHf+kvp3Z9jQOtT Wd5Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=ltTQaYwu; spf=pass (google.com: domain of fm-52304-20221213101511d56bcf66890824e26f-i7o7fl@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-52304-20221213101511d56bcf66890824e26f-I7o7FL@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 v27-20020a05651203bb00b004b4f4360405si118578lfp.12.2022.12.13.02.15.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Dec 2022 02:15:11 -0800 (PST) Received-SPF: pass (google.com: domain of fm-52304-20221213101511d56bcf66890824e26f-i7o7fl@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 20221213101511d56bcf66890824e26f for ; Tue, 13 Dec 2022 11:15:11 +0100 From: henning.schild@siemens.com To: isar-users@googlegroups.com Cc: felix.moessbauer@siemens.com, "Roberto A . Foglietta" , Joe MacDonald , Henning Schild Subject: [PATCH v4 2/5] meta-isar: introduce an example to use btrfs Date: Tue, 13 Dec 2022 11:15:06 +0100 Message-Id: <20221213101509.535-3-henning.schild@siemens.com> In-Reply-To: <20221213101509.535-1-henning.schild@siemens.com> References: <20221213101509.535-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=ltTQaYwu; spf=pass (google.com: domain of fm-52304-20221213101511d56bcf66890824e26f-i7o7fl@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-52304-20221213101511d56bcf66890824e26f-I7o7FL@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 Tue Dec 13 10:15:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 2292 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 13 Dec 2022 11:15:18 +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 2BDAFIL7000513 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 13 Dec 2022 11:15:18 +0100 Received: by mail-wm1-f61.google.com with SMTP id bg25-20020a05600c3c9900b003cf3ed7e27bsf4602786wmb.4; Tue, 13 Dec 2022 02:15:18 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1670926513; cv=pass; d=google.com; s=arc-20160816; b=b2uePBIShqMvaClARvLKa0tEF0FbNrxsEy614f3MQh13dfYBJFY1JvRSeKPjVc04QB c+iaP0R2NvGkwEoRnRXWdEiEH3KAppWKXpT3hbkvBRrdyB3rMgWxbgI76AnCcULZT6L+ VNEWGb9zTNSPcmwxAnP0n6ciE+DnvCnrW6BU5xLqV5JFTQ3PkAdTlFDsGOzEBTM0MY5v wsFhhbHPVYjhwiT6jTPVJ1JDnwdG6QKEPXgGOCClDVgfDzp3D8zITCJVA+plA/MjgHWd F+t8sl6gxS5N2W1iT9JYLFo4iwcyoftptdWNq2pG5eQReG2HTnI5XaBHrPeDzUo53hQd oajA== 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=bIoDZDjLxJwi+4MMqYG+4uEMmfefzUAqFHQn7NL98pk=; b=h31iPd21PiYRWhP1Y2ZXXlmtt02W1mH16HddcFJvR8D+Vf/pJsfimW5R384UXir7qD qnN+gSILSY1htY41OAT0vwRm4WQlqQq0ozkvm2hEKMajxB7AutH/PgMkAmsMoQKxyG6Z lZyMKuU71sfWkyCi9q4pd3avJmvA1Z4Dl2T3DScsEn6MrchhkrBY/MBXrHkaD0RQsB7v w+YS+7Ya2kKQzqOH4yMhaZWSe0oLuPq/aH0SnMVNfqNIqfPhyZjsjDPjjNwI7N6uHxJl q3WdadJ/yIEsjK2ZKcuQgVV1k9mrO6umW3t1cyL6ew1ov27IB6wNGynUnp/MaiA/kxxN UqHw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=olPfWKGs; spf=pass (google.com: domain of fm-52304-202212131015116fe2b82d25ed70816e-qfhcyj@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-52304-202212131015116fe2b82d25ed70816e-QFHCyJ@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=bIoDZDjLxJwi+4MMqYG+4uEMmfefzUAqFHQn7NL98pk=; b=q7lIv2LKEqe9ObWT6UUNPSju/VihBVtbtVrhJ+JWtL9ZKIqx7TkOHN5TJP9LBzhKHY C29G+dCbl8qN3odVFxACHp1+iCqVXke26s9wZw1XJGWuMfxqVipcLhmi4El0IWqkJDyr qPKf3GsAE24n9c1IMA5854H0g4XmeKDqi6xF5OuR8LWHRt0vj4jTkZpPNudetQDd/lEE nFvSEa1dG+nOg58x0uS4nDt7cOdAJyCdX1jgDDBPd1vdJfI8IKXsb/2C/mtAzGrTSNH7 BzmeSRqLG13JJb3gG1OuzwxWmeH9oPNrtb3NmnWcwnc0dzYgSgI+BmSmVAMJOfhl+gL7 qXNw== 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=bIoDZDjLxJwi+4MMqYG+4uEMmfefzUAqFHQn7NL98pk=; b=seq1wBW4z32AZXnIDA+1CZCz5RNaLvO9xzwj7vnjd5DEI3Ivt2XFcg9AUTGMMZdorT Y0NF9dfDg5YfJk0gWv1clTHpbWzyjfBFhYljwROFQlBCA5w33OgYtTkCMfBjKzLp7v85 W3MikpDXvCT8hxLqfnPwrJqsZwYwybPrkBpZPfyqb2v6uzG2ckV91NHUKNX0WrqWqYcb 7V5QagE2L4xwyt3Z5GNBBZ3ihxNmw7o3ddnujINbg+Tzum6ou++BIlq1YIO0VGGCgawG cRVoNM+X/lITldhruvy+E2XVDaBO5BXRv0faoyH8eeHRI6K8x7Jo8kTdUaV9sY4G1e3S 6oRg== Sender: isar-users@googlegroups.com X-Gm-Message-State: ANoB5pkaUvjfyF2l4pXpr0tUQnU4AZM0F/2jVCGaeEw6Gb4VKKPZxSYv 3ntlPuV9Tb0v/ftBx9ONkf8= X-Google-Smtp-Source: AA0mqf7WXlgBbGGrxwkndPZtPNHcZTfZbDhWd4wiqUwH0TnT+qp2rhGEl+Y0TfM6vrOQkyeQzCTFkA== X-Received: by 2002:a1c:4c15:0:b0:3cf:894b:fe6a with SMTP id z21-20020a1c4c15000000b003cf894bfe6amr131504wmf.198.1670926512994; Tue, 13 Dec 2022 02:15:12 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:2253:b0:3c6:c1ff:1fd with SMTP id a19-20020a05600c225300b003c6c1ff01fdls11775543wmm.2.-pod-canary-gmail; Tue, 13 Dec 2022 02:15:12 -0800 (PST) X-Received: by 2002:a05:600c:42c2:b0:3d2:24d2:d02b with SMTP id j2-20020a05600c42c200b003d224d2d02bmr6190458wme.29.1670926512175; Tue, 13 Dec 2022 02:15:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670926512; cv=none; d=google.com; s=arc-20160816; b=osEEwCFCbufP3sTM4H2h+7h04EiZ0H/iLm+Me2AOtoxG1zE0lnaOyVZDwjGZ4Q0yqD JeE9YicwJuGlNqnLW8UKqsQySVLzbFBL1Q3esXzDt9x6wg7poYL9gDMZaceXZzWWY1oz MzC4nY2xXGuGl1orMQrH/um2xvKLmLYBIrXlB/q16ZxrVo/mZbcO9GRPgvnLXbYFUtJJ FFFffTL+agOsV4GKvvp4wgRiXymt9n0SSpYAxm2eVcSwoF1lmdOy516h3tHJ0jWbTVgh 2BL3zdocguyL43B7zFkI1WCMINXZnK6M5A75+6miHdY8HvqMtSmy1s7WLRHd1vF4hnMd n13A== 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=pOpwT3KyFtQ76mjW+o1HB/JRyO2DZ0ef6bA47PvDSKyekGeUfNYnXcbIFVfPEUCXWg j6w0xSstex2XIOGBtKmmlB8MHxvw/rgtTZuHSmz6naa+4cj4UNlfgCJRay3asA0SZ1je qUjZ/5gI+KFtuYbS7zXv4zd7Vxqs/kuI0zrqT9sGseeiWTGV0htsZdL6DRmVrIcsxd6x jhvuK/16RkQk9uzMB024m9bSDrS/ZpuourbTne3fPLcnf8o+5llOJzqV5aN9eXderqSz gJCVP68h/97ugpXmtF9d1nki45nxRxqvs1MuZz6tytjHHBJ/r7CELGUqDtp81FQAmlHC a7FA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=olPfWKGs; spf=pass (google.com: domain of fm-52304-202212131015116fe2b82d25ed70816e-qfhcyj@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-52304-202212131015116fe2b82d25ed70816e-QFHCyJ@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id j4-20020a05600c42c400b003d2051f87ffsi590009wme.2.2022.12.13.02.15.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Dec 2022 02:15:12 -0800 (PST) Received-SPF: pass (google.com: domain of fm-52304-202212131015116fe2b82d25ed70816e-qfhcyj@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 202212131015116fe2b82d25ed70816e for ; Tue, 13 Dec 2022 11:15:12 +0100 From: henning.schild@siemens.com To: isar-users@googlegroups.com Cc: felix.moessbauer@siemens.com, "Roberto A . Foglietta" , Joe MacDonald , Henning Schild Subject: [PATCH v4 3/5] CI: improve cibuilder readability Date: Tue, 13 Dec 2022 11:15:07 +0100 Message-Id: <20221213101509.535-4-henning.schild@siemens.com> In-Reply-To: <20221213101509.535-1-henning.schild@siemens.com> References: <20221213101509.535-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=olPfWKGs; spf=pass (google.com: domain of fm-52304-202212131015116fe2b82d25ed70816e-qfhcyj@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-52304-202212131015116fe2b82d25ed70816e-QFHCyJ@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 Tue Dec 13 10:15:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 2293 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 13 Dec 2022 11:15:19 +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 2BDAFIxN000520 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 13 Dec 2022 11:15:18 +0100 Received: by mail-wm1-f63.google.com with SMTP id bg25-20020a05600c3c9900b003cf3ed7e27bsf4602791wmb.4; Tue, 13 Dec 2022 02:15:18 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1670926513; cv=pass; d=google.com; s=arc-20160816; b=yGkBbfxXcgbF0CHQZCksIokVnroyRgjbNL78NxWuJ2cI72N/DbmDxcG3mbjDiJF5LF iPrPbElG3AiyRGsCTO9bjLgJhxcDFHSLvxKktDjHq7Q+sYr03/tOCbDoJLG5jsWxupYy 8zDO7HfIT9GA4FYP+z9gCCFnE1nYpxPkmi6dDqOUooI3/a3Er7t38kqEjcKcgccOFosT hM8ZFZrPKeI4ukotAsCzpScWFY43bXIfp8DTMrI9LwTM00PAnx7CNIo81l3A0Ncpys55 0mpJKKVOo4m6VGL5XBmzfmFnJHQOHfrmwHkrGcHxyOFqifYsnGndadLSBSDwXNWr1rgc TRkQ== 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=j1uJGD+Z0Ja4e81SHgu9+Ks+gN5otqozzc2eHBSxN2s=; b=Xb6QYVXvgbDND/P8UIRP6pmP/eJninCzOgDjJIVn/xue0ign52dTv6zA9i8NpVv6sk EoyHdUJEog7IK92PYfylhhqrPTAvg2qJ4OoF92OgXbeQeRKbIF38riSMJ9EUPUjUMMjl neRGLJOH9xIAXAdgd6WwvCdlipe7H3lLqMlLV4RHwxzK4QVQIgO8jwclYPDWcVAO99jZ NEyfguIlG54lnVgYvBqduOYe1tXt2DCrMZ9ne9U+HIwkRl+G9rz1KWMhYj9XxeF1Rlqr +hmTSdJE0E9kG8tgz0YWVaDmuOdEr94c/4EjkhYBviR6lu5nILC8/zqYtO0UAUkYlSKJ lfcw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Gj40ezWd; spf=pass (google.com: domain of fm-52304-20221213101512fa24f5d1488fa51c79-tqoyvg@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-52304-20221213101512fa24f5d1488fa51c79-tQOyVg@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=j1uJGD+Z0Ja4e81SHgu9+Ks+gN5otqozzc2eHBSxN2s=; b=PLEKRai6wNi2v9XHpFwXzhpwbcjw9k9kqJ/MBVAjGYEyIDZgegXjQ37SxwcogjsHlb v6YKPZRKaEy1v3C+RUdBG5fNocWrl2cbToJzXKZFLNWdTR6yz2GaTXZNJgHAMfsA44pH tf58z5QIatH+bwTLj134jaO0kvokhiC0/dllHYgPIFh7a2khbnfg0pqo4k7diRsEoIHh jhJyp1gjR1zb4qO+Px99xVJ+WK5tYgRE12w6QZEAru0NvDerAyTlu7/QIUW4avgJ7TgB E0Nm90gWQhNxbcINJRH0st2VkyXx81I1A1WklYgXgLpx+84dmumil8n3BREPxE4NgABt pfQA== 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=j1uJGD+Z0Ja4e81SHgu9+Ks+gN5otqozzc2eHBSxN2s=; b=FJ0DTgf1m4OAtsF482+LkKkFThvDR770C5dYByk9lGZMK78/qsntpMZJ13GC5CQPfp D7ChDYzNcyYDLoLRsMW+CdwjNwWxrTRYXgNpUswWGx117k3loySQNQhVXpz7pik5+YY+ C2tsPzsYbsuu//ONiyHw8pVsIMe/3KARnLcENmwtimZPpcRxLyqsbJ0uCBhAV2SE/+EG 03j+BbzrG7NFdO5t1ongHGhfwsofPpblAsMmpTsqKKKr/YSEYUKdAU2foIPkBa07MvWA f4q5UeNjpyCrCPQplMl4mwQWIq6UFrg6PRmE5KDemJ//oa+AGvVfDEOLdnCG81KWTFXv bGWg== Sender: isar-users@googlegroups.com X-Gm-Message-State: ANoB5pkcsm2JMD5J4NRbUa3hs7W3bB4csroSuZ/FvIeweZItYlsoXx0v 2ImEDtpTMBjisK1IqQzUVcs= X-Google-Smtp-Source: AA0mqf4JozrzEa1UrjoZ1pVM81xRAYovdkuPVnt9DZgdVSu2H7XzaNgmfZy4tavc5UrIleWhIjSjeA== X-Received: by 2002:a05:6000:4a:b0:242:2db9:df6e with SMTP id k10-20020a056000004a00b002422db9df6emr22130091wrx.480.1670926513394; Tue, 13 Dec 2022 02:15:13 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1c11:b0:3cf:9be3:73dd with SMTP id j17-20020a05600c1c1100b003cf9be373ddls11778526wms.3.-pod-canary-gmail; Tue, 13 Dec 2022 02:15:12 -0800 (PST) X-Received: by 2002:a05:600c:d4:b0:3d1:e1f4:21dc with SMTP id u20-20020a05600c00d400b003d1e1f421dcmr14808028wmm.14.1670926512381; Tue, 13 Dec 2022 02:15:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670926512; cv=none; d=google.com; s=arc-20160816; b=ybBqvMBPJuw1UKs+7UC0TEg6JlZLoXGUDe5VL2M3mmwAupfQHaCFKWz8zH24HNnGRl Wh1Gb/rEyMGcqgzKULyMA9/bHrAVOnA6TCCFaBpRvQmpg1B685PJOnFsoQzP0vLUrtln zeUkHRpA3KdzA0NVenR5V8jXuWf7HOgCbmpFEoZtoCUIcbh1jIbAlSJFRaEQU00vSAdl 9H7k7va3VCX06R6OwdheYIcHHAsaY28vf5BcZ84tpwpYBSuSy9S6ADH7j8SKHLDr1B6N gH0+UhvbS+OAgCOGcEf/JDiJmA4mORtcLCTmPPrmt29YvS7qPPTdPVcn8WjGip8dRkni vdWA== 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=RjC80W1YfYS+YsmOjz0qlb2IWUKGyovU13VGpz95si7x21Kstcs8mDOFyhkRXdgFY1 b0qjSZNWj5k9LAmJq8RGUNyuzmMvyYxMGV/1BhHmU+7SY4TzG8I2FSmuCkZSLB1Uc86E wlgiGwB5hHHWTCo4lZxayQLl0J6VHdMrHH4U/iJKEBO2TfC7PlERrzDH+4NKjbBMRaoc Pk0WadLUWay7OU4MYwTmvSM0JGqVm5FeaK3e8+kJvxontq3FgUKTpR/vU+ZAgr5eN0i2 wuImKfoljYkZp5dTxzshnOHEXbu9GgsVNJhKS30PUzWPmtRqAjG/jA03/KuvKOyQYRdH pRdg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Gj40ezWd; spf=pass (google.com: domain of fm-52304-20221213101512fa24f5d1488fa51c79-tqoyvg@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-52304-20221213101512fa24f5d1488fa51c79-tQOyVg@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id j4-20020a05600c42c400b003d2051f87ffsi590009wme.2.2022.12.13.02.15.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Dec 2022 02:15:12 -0800 (PST) Received-SPF: pass (google.com: domain of fm-52304-20221213101512fa24f5d1488fa51c79-tqoyvg@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 20221213101512fa24f5d1488fa51c79 for ; Tue, 13 Dec 2022 11:15:12 +0100 From: henning.schild@siemens.com To: isar-users@googlegroups.com Cc: felix.moessbauer@siemens.com, "Roberto A . Foglietta" , Joe MacDonald , Henning Schild Subject: [PATCH v4 4/5] meta-isar: install expand-on-first-boot in most images and add space Date: Tue, 13 Dec 2022 11:15:08 +0100 Message-Id: <20221213101509.535-5-henning.schild@siemens.com> In-Reply-To: <20221213101509.535-1-henning.schild@siemens.com> References: <20221213101509.535-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=Gj40ezWd; spf=pass (google.com: domain of fm-52304-20221213101512fa24f5d1488fa51c79-tqoyvg@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-52304-20221213101512fa24f5d1488fa51c79-tQOyVg@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 Tue Dec 13 10:15:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 2295 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 13 Dec 2022 11:15:20 +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 2BDAFJfp000524 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 13 Dec 2022 11:15:19 +0100 Received: by mail-lf1-f61.google.com with SMTP id u13-20020a056512128d00b004b53d7241f6sf965835lfs.4; Tue, 13 Dec 2022 02:15:19 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1670926514; cv=pass; d=google.com; s=arc-20160816; b=OAe7wv4MWiR8d6Q9ntCccVFqDoArZJLoG6+t/69Uo4eE1t1205YKe+bCefYjCfcfSL 7ZKk97E/o+hwu7aNy9Ur2ilpFWOLjtW9yqA+AFVkJBsKOJWfh1IuXohUIs85OD3bk/4H hBrtUoIJ5ddFIN5qJ0gvLbpIrBGeiwnvf+GuTKDkJUw+mY8kj8osvSGUtnGxcy0ldfQe R9dzYlfqn4tBOPBB2iZnJhm0h6bRPVt3Eiez+5WMwB9OS/dTsVY7E5UnTaYtVUwThDsS I+pT3nOoujHtZTUv9V2Mk1iNmOaTIywBlfi2IKrhZ2V5Qenl3l21pYlj+PFR2JU6qnui 9rQA== 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=gjY2Mh5Y0XXQK/VYq79g67COxpip2uPG1is3m0VsCOY=; b=kW0WqvqjOwLTNyH2PGo6tXPpc4IZd715iHYuVV7nLohRLBzHJ4MsqjDTfGFQ/GCEbu yA9R3cqN/Pz8J6MHNJYrV3o2GpZ0rakY8e/a95U1jNHdyF49vVey/4sWA6o8QqZDisXt XRpmKdkMm/+0dIR8f/eAMdHfHtXfQ2KQsStpo+40OIucDN9j/bXN/R1HGBgT8WCnV1Lc LWkVJhabOsVE7BQERTeRGp8By7rU+OxKtuRLuSQoUsxXzl3VFGptqOnOpaMvFIx0T3oe OSAlVNRngyoQMYXM+RDGQ+/SuDxxSMvZHhLmu/t5T4qU2x/WyR8Iq7E6kA668fvnpjr0 KEsg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=RJd2vK+0; spf=pass (google.com: domain of fm-52304-202212131015126b8d0834417422ce9a-p4se2a@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-52304-202212131015126b8d0834417422ce9a-p4sE2A@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=gjY2Mh5Y0XXQK/VYq79g67COxpip2uPG1is3m0VsCOY=; b=P+DaNkW2Xm5oZayGgSYfG4pT/7iqL7CxxQAZUrLnPMUPPTMwNQvWwsKYmlj+MhBuLX Fb8CLE8aUfrokWo7BUHE3zKhOyvMlTpQJk4jYMW/H6988AS0Wv39rtmu2jRzlctvmET1 pRlXvAqkzp3Kn74RtHJDY2os3MaylaEszNHzbvIpbSyvMDODJ77ODw7mzkqzfxkps8Uw +YFmCOT0bxyGkWmI+uypJIGSQHMqiawPeOKOrM1bA9ECdhiODBY/o+UxWr6U0Lsdyu+T VSdgLINMRmA7fNerJXlnn6jbgQ32QBqzb4mpiH25Bdm7/OkCa4RzEQ0WR3Db3mSHMDx/ y9Sg== 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=gjY2Mh5Y0XXQK/VYq79g67COxpip2uPG1is3m0VsCOY=; b=jjG9eK67JQILN8XP1y3yvnCGTnDAd52p9vfWyeLU3ibyKF4CutQmMXFmbyLGaKMFe3 k8W8Gh9Dbzxq+ue+DdOLOowvPSEdJKpocFujwTi0RYV6eCFx/veEqj4tWuL5KKjhSNN6 gfzz0P6tSzJvkeGNzxvTpgO3Wh2XanlSlfxy0g8hJVB0sRujfJ9xCQsw/Q+1uaQbTy8t NT2GHozNC28nZSPDLsy93Fs8hRmidPjd+/vuOLSIyWgpv+9snmuxvkEKPDNUF5Wd+9av 1Mp169wlZTa2/Xgu+ZvCMVR5PTT3wda8Z36IkByVrI8/+7Ocw83eDZz+InzAIyZEQqKt Rniw== Sender: isar-users@googlegroups.com X-Gm-Message-State: ANoB5pm/u6R6TO41af7fpyFVRr9m/nFh/2B/tx9eOC5JgqyPfkk/7gp4 HS3UmYu0Xfc6PZ0ozyLkPgY= X-Google-Smtp-Source: AA0mqf6jVyl2rIi/GXGgnrtWrqBGn9OV6VKeKpF8kY0OiGFcaF43XxnMUKkVSlyXXJEIyxH9K6oBvg== X-Received: by 2002:a05:6512:3992:b0:4ae:5dc5:82c5 with SMTP id j18-20020a056512399200b004ae5dc582c5mr37589183lfu.2.1670926514046; Tue, 13 Dec 2022 02:15:14 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:208e:b0:48b:2227:7787 with SMTP id t14-20020a056512208e00b0048b22277787ls2302546lfr.3.-pod-prod-gmail; Tue, 13 Dec 2022 02:15:13 -0800 (PST) X-Received: by 2002:a19:7613:0:b0:4b5:a206:30ee with SMTP id c19-20020a197613000000b004b5a20630eemr5269968lff.65.1670926512953; Tue, 13 Dec 2022 02:15:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670926512; cv=none; d=google.com; s=arc-20160816; b=S4Pp5SXZx6csjYriip4hrzlKmC2Q99t/TKuVdh73tNzKaRdDShon2H1xrd91TGejD0 mGhYroWKhwo+5mXMqXYEJG2BVAgvVzzi/Uk92h0Gc1q0jOhj7BrblPPxqe4U9r4JZa2a vGv35nNriO6sbnKIRM6AgZdRebRDJT5ukmuTzf8o+EoT9m2bBAVP7rSParB7bF7jD82+ 4/F/u/Tu7oZsNSJylTQciYme7eDYMIfPew3tFKQ/J2ZbRhC0SXgKo6zf0ZWa+OnHgGb7 wJ2zrj3m2HmoJbHKEb/acs6xE7eFzkZa+IPQr9oDe33ybCs+fdvoyuovYbwwNYY7cBlW LnKQ== 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=u3wUAf+a8L4p6qZpbbOMZ5T3PM18YI+Kl6uf6S/18GDj/sRKuecTZuyHpPOV6HCQ6E zjV4V1tUQFYAJdfYIh2cs8vCFOBQF+GJExe0DtD6gckBgiNtts6S/eJ2D6HRHnCOzq2F O3SOovMHyaLf2MG5w2vGZEzT0mEHnVPSbQkj9sVQ2tEgPmSqYwNQ06MO1ifOoDGBzrpQ ArrrEkpiICDy86yEobo6nHVAUW4dKTUYkxECrRP5L5te2LnVrB/pSltAaOjSE8SZuRii pny7OExO2+N5wuU90nRERGIhA6ID2EkdL5e0FFL/VxW+0Cj+zxdGNH/qN23+zd9pwiM/ VCfA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=RJd2vK+0; spf=pass (google.com: domain of fm-52304-202212131015126b8d0834417422ce9a-p4se2a@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-52304-202212131015126b8d0834417422ce9a-p4sE2A@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 v27-20020a05651203bb00b004b4f4360405si118578lfp.12.2022.12.13.02.15.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Dec 2022 02:15:12 -0800 (PST) Received-SPF: pass (google.com: domain of fm-52304-202212131015126b8d0834417422ce9a-p4se2a@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 202212131015126b8d0834417422ce9a for ; Tue, 13 Dec 2022 11:15:12 +0100 From: henning.schild@siemens.com To: isar-users@googlegroups.com Cc: felix.moessbauer@siemens.com, "Roberto A . Foglietta" , Joe MacDonald , Henning Schild Subject: [PATCH v4 5/5] CI: expect a message about filesystem resize vom expand script Date: Tue, 13 Dec 2022 11:15:09 +0100 Message-Id: <20221213101509.535-6-henning.schild@siemens.com> In-Reply-To: <20221213101509.535-1-henning.schild@siemens.com> References: <20221213101509.535-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=RJd2vK+0; spf=pass (google.com: domain of fm-52304-202212131015126b8d0834417422ce9a-p4se2a@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-52304-202212131015126b8d0834417422ce9a-p4sE2A@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)