From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7158446333307650048 X-Received: by 2002:a5d:5a95:0:b0:250:90fa:3e3 with SMTP id bp21-20020a5d5a95000000b0025090fa03e3mr278305wrb.653.1670920415681; Tue, 13 Dec 2022 00:33:35 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:d231:0:b0:228:ddd7:f40e with SMTP id k17-20020adfd231000000b00228ddd7f40els10171488wrh.3.-pod-prod-gmail; Tue, 13 Dec 2022 00:33:34 -0800 (PST) X-Google-Smtp-Source: AA0mqf744difKRl4S9adbi3IBbWGqrsFqewffeRYo1SoJmgKMS7pBwqLS1ibCW8TnE1Vo0BU5PcA X-Received: by 2002:adf:e0ce:0:b0:238:3d56:f061 with SMTP id m14-20020adfe0ce000000b002383d56f061mr12564756wri.63.1670920414494; Tue, 13 Dec 2022 00:33:34 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1670920414; cv=pass; d=google.com; s=arc-20160816; b=LYqozvXeY4xNTyuAX7xUNAG/4AOjxrwxsIRaLbharqzutYgoxRbX43yeJJt54mO4LO 8VctC6yhwg2jKP0emOzuvTrc8UY2QwXk0b3h6fCw4e25SDGNkV1QeY3Anvc1CiVGBoX8 T3Vs9pfmFFZXbjNt4gaqkm+dHr1+0fcISLKeThHSr4ovaXWeKZjKTd3HrgywT7A7pAGV LVUjaA1lg7FJs+XbBDIQt//55mrUkULPhLgt/qP/CW1Vx/BdhHzpcGV7BGv+Qm7GBG1o H9cAaCYkfzwQozbX3hg8ZgcptpIoFH/pC5Gexvtn33dU4C3QXGb0XQKh07gqIp60OK0v ai2Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:subject:cc:to:from:date:dkim-signature; bh=pTHDqfNjwNKVbzNJvfKhjuamBNMfJi4co9uivnjsWV8=; b=k8rQ9K02+c/R8CIChz03W1k4F4FvOt5tcyzbgwRWufIGw+Fd1OmUhq++smUtpEokcQ OX/DNESYgMPBm3ms2YaZPd0XkQP+d2X1xXTPwkwnx1kpKDrEt21A4OnEAKx9f5puFM7L +C7UQY9HX8WSB2Ko7YlLRLPirvBa5wmi1CnXWZ/YjWJfP3bDmTy6XyCwvDDvmYqSZuGX lyB9VeN+BceV7Z4Ctzo3JFRd5E5fD5tNSsepV8V6/FEWHdl2UJskezR/xDpiLv1IbBZQ oJAGZhWUVPYoXrz7UPGSpVR6Y/bXQ5HP+u2QfI+BWFYf3LQh5ySvM+1xzVMDUYLJzs0s ghZg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=MvOMIX3c; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.105.45 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2045.outbound.protection.outlook.com. [40.107.105.45]) by gmr-mx.google.com with ESMTPS id bo24-20020a056000069800b0024222ed1370si589374wrb.3.2022.12.13.00.33.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Dec 2022 00:33:34 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.105.45 as permitted sender) client-ip=40.107.105.45; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=MvOMIX3c; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.105.45 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PC7bWbJxDRla91OzWiPY4+0ckXZGXcOunQNyz27Iy7DrqgKQyxOt/aOP4+p6z75GB4IOmASK49AuIFw+O7d0GAnjqzVW8iINVbq7yH8iu66u6sbpY+nCqSTdt/K5Jf8jcC3R30rrmylXzMB3poixK/tkeLYJdTBKyBBhB3eKkX7TXFSVXB8Cok/LSsPYJ+ql03iISdesyFlY7rnZ3vEn7PfO9G6BetFtuJW/H1tnmu7VfhxGnw6IuTlhXnAGFdZkYvR5b5OcoKuZBPw5NY4uBbLUfPzwEeBpEdhjNfhJtbYOHPxuyX8uj7wyfz9T4q++3DiUhjCymBontZ4EH8Faqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=pTHDqfNjwNKVbzNJvfKhjuamBNMfJi4co9uivnjsWV8=; b=gI6UrbO6fmc7SX4i1tfmeHII31zfsACNse2P9HyYz+mNVBVOsfeTPdRJ3wS+UEX4tvWtMN1mCGJ45I3tYG++0rH5qwYdiwfm+SKDDgvrVvi6X6Pa+S463wdajl+UG8Ne8lIC+ETmZt6nDLQCZ+6sa34Vfyvp/NUC4QDYeRq6Hc6RGdRFg1ckSpn+1YDjtzUjasU39FI6rIT09rFC8lmnlvK032Vfd2S2OYy/e8qUMiDLKqxc4uS3yJTSo7jYVUpMJmgZolUMgp+mBysLOPmc2Nh9F4xw3GWODFNw9Kvx6vDYVLomxYdCQuE165EhQytcY3ejyJ1XZlH53rc/H1extA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pTHDqfNjwNKVbzNJvfKhjuamBNMfJi4co9uivnjsWV8=; b=MvOMIX3cEJlVLQs3Xj+b/ByogXsLXptY+O/kseJBkpZ6UiRFlYqmyIziBioKRP+SPCsHMwLUU7cD/0VHHrkoeQNliPGg6f9J/x0OhWsQ9LowJGYi96O6DO+o/OIkkVh5VWUwzyOs5f9EsjQZaes5qJSYtQOsi8x0FDDZyftgLMtle5IbZVb0wcc0H1jDoEpLpwwjELUr4TWkYu1yrOREeyLU5ajERex4oy8lmOUHn6mBVxTwtEqokLeAUqmpzVG5tDzG1nYnSJDhWOicXpMrVnp9anqPe24CKWyDZdRMkJI+EdGnEoeA6L4Ftvg8VPzBMOmk6nMXTU7B8MVgCo4/ZQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) by AS2PR10MB7478.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:592::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.14; Tue, 13 Dec 2022 08:33:33 +0000 Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::bdf0:fdeb:f955:bc79]) by PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::bdf0:fdeb:f955:bc79%3]) with mapi id 15.20.5880.019; Tue, 13 Dec 2022 08:33:33 +0000 Date: Tue, 13 Dec 2022 09:33:24 +0100 From: Henning Schild To: Cc: Joe MacDonald , Tobias Schmidl , Jan Kiszka Subject: Re: [PATCH v7 2/2] expand-on-first-boot: Switch from resize2fs to systemd-growfs Message-ID: <20221213093324.0e3d0d57@md1za8fc.ad001.siemens.net> In-Reply-To: <20221026082101.17364-3-henning.schild@siemens.com> References: <20221026082101.17364-1-henning.schild@siemens.com> <20221026082101.17364-3-henning.schild@siemens.com> X-Mailer: Claws Mail 4.1.0 (GTK 3.24.34; x86_64-pc-linux-gnu) Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-ClientProxiedBy: CH0P221CA0019.NAMP221.PROD.OUTLOOK.COM (2603:10b6:610:11c::8) To PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) Return-Path: henning.schild@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PA4PR10MB5780:EE_|AS2PR10MB7478:EE_ X-MS-Office365-Filtering-Correlation-Id: 4f365333-a923-4407-a64d-08dadce4b882 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mY1ofb+99TU1iYj94uP0G5/hxmXfBpBV4IGJyT1UvAEboL6zD8zqXnwzXLaWZSXyMzS7BRAZoqbdH5sTXVZxe/5OSvE+tfBWhE4n4/SyeKExYD70EPWt6b5x+Oyhfq5EHE1Zr8w+GWSjQrTFG3oQlvO5wMH1fRuSo9YhbCIEDvH+A4vwoy7sUYxzeLS2AFcGGY5OB2GfladwayiLeXsKhOLlM4djXfk45eTM/KmlBlCAMl6xMuqYWU2KaspqooCQ5EJR9LU6VnfiscfOraD8Vk9QJXqxJzQv1Sa3q/gIk+3aft55SbGTDt7Q8AFUQcAOBoO83e47rJbtpMYYGXyU/UNtAVKJhrBgiwwcQkH97F9ahDpRfYbbX6DQu6VA9Bw8tsyapMzO4An2mGUtOXRVpWQ7ct5r37nJtBSFjqpuTj2PSCYFXAVrl5Ajf8MyDMCJ+Fdlg/daQiDYKA9y6/h3ASFeAld2L0Hx4R3yUsCjxJKRMldECmJhUkt5AWL0QHNT2fYd2wP7JrbKMvtwKgxBdAVEnKTsttezsY3fEirwZeQuJMUeaJHwdkhthemuIj3E7YhNEqNNuM6QH2b6NuYQUc+38lNVdFLPvFhPZclYZxr7gHfi7hKJhklqlNTWtoZ/epjCSI7hQJ1388GpEEsItw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230022)(4636009)(346002)(39860400002)(366004)(396003)(136003)(376002)(451199015)(107886003)(2906002)(44832011)(4326008)(5660300002)(8936002)(41300700001)(83380400001)(86362001)(1076003)(8676002)(66946007)(26005)(186003)(66476007)(9686003)(6666004)(66556008)(6512007)(6506007)(6916009)(54906003)(316002)(82960400001)(38100700002)(6486002)(478600001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?54fUSA4d3CTHFyBbBA33HebvMQQ4Uh/J4if0XAExUBnKCOESe03DIE3tvDEJ?= =?us-ascii?Q?JTWI3bmIwrZAo5o026QWRgJBlz7t7JzUfphOngq38CzvbJSe3W4Ej7jax/q5?= =?us-ascii?Q?XkHcsO7LToWBQOyQQ4NWGkYLH78tVliBTCexCuGvvyWAeLCiNvLSnWvFanO6?= =?us-ascii?Q?g1AsZpxQ6WYXbomQ4ONouGwj6usPuTLk9h0yp43m8v3E+sIqp4T0KPsFtHM+?= =?us-ascii?Q?p3z1LsFCooyXaY5jcwKH76WEDUs8uk1p2jYw+KsorNdaKanh269yHdbuXi+t?= =?us-ascii?Q?ghAHlhFI3+oKfW9uwYMB4VS/hBbzXY7TzKyWfsTyQbzl2Mpz5BcgpG/nFP8j?= =?us-ascii?Q?DuBcdNRXETsp/dMUA952FcP3BQ6pzV750Wtda++tBKFgAftH/pTkN56Srg3g?= =?us-ascii?Q?UFgXgVJVYGltLL7Y3yc1/SA8W/OWxzjPYL6TlObRyWecMnRbd8lnKFrG/bOB?= =?us-ascii?Q?RLX5HJSGRZA3shcCT7q3Zx5x/t/ZjKMZZUmoeWs1zxlhiybYLRwqUpz55E/z?= =?us-ascii?Q?qVneIharPjmm6pzOskBE9vJcDwiSX5z9KETojqqv6U4sAywbd6Fwd+QLRqhE?= =?us-ascii?Q?RLJANHy9n6aLAuEAUpwL67uLW44I41dX04GaO7gVkB7GZbA0hw8uYMS2JgfF?= =?us-ascii?Q?bXk9SDN/Sse4v+MrDTAvzh5ARihac5gSilGE7mF0thyMTQYNnXxNncanGj3Q?= =?us-ascii?Q?jvtkqgk82Udl8rhA9PuVcjhc5jDUf5eyuQtvJwW5EOsYCMpuGqBT7ZfUgzSA?= =?us-ascii?Q?OTInDpSrf5yjuoGvPAX7HxXhVi2FpDCr75MRIkPzzr4mDds6supgWi8B8Dyw?= =?us-ascii?Q?GqSX/sxIaIWQ7WlIGjSD9VgjXSHkVPR2LxU6V9WzR7Rn9PioFpg9RmQCaIdF?= =?us-ascii?Q?6S8hhmxddvr+gILhZWhsoAqsHrgCC1qzuoj+KgqLYgKA0gtGGzpxRCi6DQJs?= =?us-ascii?Q?4gcvip62MzreV6JlLHqczqsQ7OlDCuwkUruAYY6J0fIgpcaAqqPMiG2G4k5q?= =?us-ascii?Q?EUNcRf6iId0uwV17XNOVx+Z1EosykqotWs64V94L1Qlj/0DBuMUaD5OiPmqH?= =?us-ascii?Q?ilMJdI2AKSKEiS2iEJQg4ly77phHMU3c7Q2lIf0ET1TanUjqB8cdCANtlvSJ?= =?us-ascii?Q?3gAvsaYXVcFeB9P5PRDIRE7NeDqaojalzWHZDvh3MWt4Kvwx0QJ8EN8J75wd?= =?us-ascii?Q?SydPHCjAzmuzVwJjp6i5I0RTCn8rwtkM3pRDxYsJ+GnMEPlckjNJ82qxKdbb?= =?us-ascii?Q?QxGw1hFJTM0nXEdWHIGq2yQ4BB0L5qOd37lIkOEszahJpZCQqcRQMVuYlyN+?= =?us-ascii?Q?EpEl/FYzC0WvweF3PkZGbrxkoJh0gXwGIKtTkW3TcoOK0JCnYLiYBmvsCkwp?= =?us-ascii?Q?FpOROgZbgXLwxlL34R6GECEyP8+xnl9wQXBIUhEm191+ky/6dcF9pOTYnylj?= =?us-ascii?Q?Vap2626k23hgDiX5y0N1UxB5fJU6t9SIjEcgB601Sv9PAxbgstyGtmEhGpuN?= =?us-ascii?Q?EuFbDUk8vAyK10MUbax4LrjjpORJo0xRHMW5WhcspZzaCWkBMOQlWaVGFjAx?= =?us-ascii?Q?brabJxgyy5dmr89zheeMF70QeVFY0MYPUXmgtuoG4ZyNwk5KOHeBbwpaz4HE?= =?us-ascii?Q?5Q=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4f365333-a923-4407-a64d-08dadce4b882 X-MS-Exchange-CrossTenant-AuthSource: PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Dec 2022 08:33:33.4913 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: II0gblnjs/o8VCUfNz79o3Z9RqvqZgOacfK9hP2BZBP7zHZfOGg23lU70E6apNGrmybFRSUoHVIVoQqIWbgogoP+rzv8s+AGUIftzSf4oR0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR10MB7478 X-TUID: 1s6F9aDqSbeR Am Wed, 26 Oct 2022 10:21:01 +0200 schrieb Henning Schild : > From: Tobias Schmidl > > We want to be more versatile in our approach of resizing the last > partition. Therefore we switch from resize2fs to systemd-growfs. > > This allows for ext4, btrfs, xfs, and dm-crypt partitions to be > resized. > > Signed-off-by: Tobias Schmidl > Signed-off-by: Henning Schild > --- > ...oot_1.1.bb => expand-on-first-boot_1.2.bb} | 3 +- > .../files/expand-last-partition.sh | 31 > ++++++++++++++++--- 2 files changed, 28 insertions(+), 6 deletions(-) > rename > meta/recipes-support/expand-on-first-boot/{expand-on-first-boot_1.1.bb > => expand-on-first-boot_1.2.bb} (89%) > > diff --git > a/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.1.bb > b/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.2.bb > similarity index 89% rename from > meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.1.bb > rename to > meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.2.bb > index 630e8d2cc510..0996000c3ce0 100644 --- > a/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.1.bb > +++ > b/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.2.bb > @@ -1,13 +1,14 @@ # Resize last partition to full medium size on fist > boot # # This software is a part of ISAR. -# Copyright (c) Siemens > AG, 2018 +# Copyright (c) Siemens AG, 2018-2022 # > # SPDX-License-Identifier: MIT > > inherit dpkg-raw > > DESCRIPTION = "This service grows the last partition to the full > medium during first boot" +MAINTAINER = "isar-users > " > DEBIAN_DEPENDS = "systemd, sed, grep, coreutils, mount, e2fsprogs, > fdisk (>=2.29.2-3) | util-linux (<2.29.2-3), util-linux" > 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 759ff8b61ccd..57055ccdcbd8 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 > @@ -3,7 +3,7 @@ # Resize last partition to full medium size # # This > software is a part of ISAR. -# Copyright (c) Siemens AG, 2018 > +# Copyright (c) Siemens AG, 2018-2022 > # > # SPDX-License-Identifier: MIT > > @@ -57,8 +57,29 @@ sfdisk -d "${BOOT_DEV}" 2>/dev/null | \ > # Inform the kernel about the partitioning change > partx -u "${LAST_PART}" > > -# Do not fail resize2fs if no mtab entry is found, e.g., > -# when using systemd mount units. > -export EXT2FS_NO_MTAB_OK=1 > +# this is for debian stretch or systemd < 236 > +if [ ! -x /lib/systemd/systemd-growfs ]; then > + # 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}" > + resize2fs "${LAST_PART}" > + exit 0 > +fi > + > +if grep -q x-systemd.growfs /etc/fstab; then > + echo "Found x-systemd.growfs option in /etc/fstab, won't > call it explicitly." >&2 > + exit 0 > +fi > + > +# mount $LAST_PART out of tree, so we won't conflict with other > mounts +MOUNT_POINT=$(mktemp -d -p /mnt "$(basename "$0").XXXXXXXXXX") We have some layers that make parts of the filesystem structure read-only. While this patch will be reverted the code will come back with another patch i will propose. I will switch from -p /mnt to -p "", which essentially means going to /tmp or allowing people to set TMPDIR Henning > +if [ ! -d "${MOUNT_POINT}" ]; then > + echo "Cannot create temporary mount point ${MOUNT_POINT}." > >&2 > + exit 1 > +fi > + > +mount "${LAST_PART}" "${MOUNT_POINT}" > +/lib/systemd/systemd-growfs "${MOUNT_POINT}" > +umount "${MOUNT_POINT}" > +rmdir "${MOUNT_POINT}"