From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7114631008580796416 X-Received: by 2002:a05:6512:3085:b0:481:182e:a06c with SMTP id z5-20020a056512308500b00481182ea06cmr8377739lfd.374.1656660818147; Fri, 01 Jul 2022 00:33:38 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:1693:b0:448:3742:2320 with SMTP id bu19-20020a056512169300b0044837422320ls136134lfb.1.gmail; Fri, 01 Jul 2022 00:33:37 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vqOGTsupJmUYGKjmqY/oB5LOSXk4UTOaFob3UZgMDMz8SjIMRNMFyCMSJayoWmg6WCN3hU X-Received: by 2002:ac2:5d31:0:b0:47d:c71c:50d5 with SMTP id i17-20020ac25d31000000b0047dc71c50d5mr7991916lfb.665.1656660816961; Fri, 01 Jul 2022 00:33:36 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1656660816; cv=pass; d=google.com; s=arc-20160816; b=KOuS7mPmDODQ44uabSjluF09NdqKvmg/3+ruXbjn6+Hu2dJ22IofIktSwL4tmtHCpy 2rIuOri3GvQC9HMhuxetqNunUvOuZrVVVVXMQBomVAztAOflzv8zx9bWx3Gh9NxSoGGF 1QE3mBd86fgtPhDyFXs0BCXq7g0e8WhNYNVYJxRs+VJghRO88x9VKGBNPWcZlMNHxmxt 9gwKpL/ulQW7Yh9VycA+R2bYrPKip6BUTxjkK8FWJtCJe8kZG32RNNYvKwFp1rZa7NKU WhBj4vsW4/2D31z11sK1irJQBkhQbpXkP8V3bHAFFBUXtwT0lKSRNiYDQu/diz6KcVlZ 5FGA== 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=6HHD/aaxkNUKazr9z8FIvlXZB3DkWMkp3WXqo5CHPqM=; b=NV9JRMh78mFH9a2t36s8rEw2w7Ze+hoVZIwBOy0UUmjDRHjbZ0UTSq17Mz7BlJvr3w R9hCsmZu/wxNovzkZwaI52wOp7YuaaWwySBhTicyrI/4GJp4OMftKH19Ais3W8+KiEpD hw0enoEiYj2XYdpqwrlKZm2PY23xG8vQHhGLnsY/hObEQ1G+tsz5t/1yGaT2uH+Jtqe/ WMC4Rd3hxslk9u7Rrf7ndIQfByWeehEBr2nCt9hDP7kbp2UqZKScUZBj7LMTd5JeLR22 ufHIrzKGSP6duP6zhC5eCaKcAGaSRpRKoT9nNWPrSFQ2U4OZpznqRjZk7a6pkzd8eDpf HRcA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=uW75J9Zk; 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.8.53 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 EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80053.outbound.protection.outlook.com. [40.107.8.53]) by gmr-mx.google.com with ESMTPS id bd10-20020a05651c168a00b0025a72c1807dsi940048ljb.2.2022.07.01.00.33.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Jul 2022 00:33:36 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.8.53 as permitted sender) client-ip=40.107.8.53; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=uW75J9Zk; 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.8.53 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=XQifLiwOLOv+E1cAcvPioKqHqwWirT1RieCW0aWYvKnWGtbvJQUa/0WpYOm5Eltqhopn5MI5bLBfwItOj7/LRjUO+Yc6fntou3K5GDhg1jQci3DUI+oco87WlonOPUgSxEJoQUq+LF0jaMaLrGoUeom95n29tbuCKhmZPuTcnN6thJhK2Ul6ED24S/od35yXMPAMBq6sbarXyCKt225BRnM+n0S4Uf4/EeUmjZw4OdnHfR6FVeViBlMTE2GwSwL4ak0JTDF1cPMDdU7bkve7WHYsZ+VUfaYq/C/Kk/2VoU5gZxSP77BX+9EIufy+J8QwcDXN+4z6voKgfqaqIoyKcg== 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=6HHD/aaxkNUKazr9z8FIvlXZB3DkWMkp3WXqo5CHPqM=; b=nTExiG+wNmB+wgx+7WSNDQU3yCVuuhfX32M64YTvIoYMJmEf20hUBwecuBF753yt6nR8tVyW5G3eXQU9K3+o9OEkHqTuvj2uWKMjTA1U4joI6teGY8/zU7nEt71wTL89phCSS9ZsrZ6Pu6ABq1YOMLVkInHTnF9N0RkiG7aZv1Xjv0fayWTjKl5BmVsEp/ejkelFsut4PM9P8MqokJUCK9t1UwhWSPfdzlV5otg3HP+91ZqyuvWS/KBeEvoMCv5GJ7HSHQodu78l5kfOwQw97PVHzwRuYUbT2vUum3jSbsHDY6P9mK7E62LXeUvWvQcus0mzwinzcBvcooU++NUTIg== 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=6HHD/aaxkNUKazr9z8FIvlXZB3DkWMkp3WXqo5CHPqM=; b=uW75J9ZkdmFRLn1UYBCViAG+53coGK1/eHpi7nuT3KqydkwX0nTIs8OsUYZHx4mW/9ja1lMWLW7XAnsL/9u3r8XvrO/AAQlETCG9vkXzPE8rbIo9qosgxo4TJcEdG1B2qJSjhYckWQF8i3k6qx3sBVQh5m4kFkv/I3MZ/qPFXHF3SoPaQfZ+iQc+M9m+2fVbBApIXdcSA9lJJdkgAphV3p59tfMaMfmnf/e8BMLu6dRiJOeZQyzeVDZe/eSqRnaKQwqF7N/Qfh9JLCj1xobEETbihwszHxndyyofAMZ8fj9UeO4yp2T9y4x9lAY+1EMO2d7098kvuk+HqSn6oRLxzQ== 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 AM0PR10MB3203.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:184::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.15; Fri, 1 Jul 2022 07:33:35 +0000 Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::b925:3d3d:8f5f:c4d9]) by PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::b925:3d3d:8f5f:c4d9%9]) with mapi id 15.20.5395.015; Fri, 1 Jul 2022 07:33:35 +0000 Date: Fri, 1 Jul 2022 09:33:28 +0200 From: Henning Schild To: Joe MacDonald Cc: Tobias Schmidl , , Joe MacDonald Subject: Re: [PATCH v5 1/1] expand-on-first-boot: Switch from resize2fs to systemd-growfs Message-ID: <20220701093328.6afb1538@md1za8fc.ad001.siemens.net> In-Reply-To: <20220630164124.GC26667@mentor.com> References: <20220630135531.717696-1-tobiasschmidl@siemens.com> <20220630135531.717696-2-tobiasschmidl@siemens.com> <20220630164124.GC26667@mentor.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: CH0PR03CA0213.namprd03.prod.outlook.com (2603:10b6:610:e7::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-Office365-Filtering-Correlation-Id: c6f4fb9e-31b2-441b-7634-08da5b340155 X-MS-TrafficTypeDiagnostic: AM0PR10MB3203:EE_ X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +SuwdMT+Nfkm2ycJDaU4JbcHdY1kTr4ey8dISH1rJbfWFfdbmkr8kGtgw5C2mtm1o/A++is+0AJb9AycqGYoCcWWnA98e0v5jlum2EBbtPJTIMDIP2J7TWvtjtpr/JMqEThjg7l351MI6id60rQrrRPmKXryQt1s0M2FafMqVcD1+aiYWhB3sW8hssl+cd9F/gc5+Cum1TFOs7gRjru4z1HpUgb5TA/spEJpZR+I98TR1QUGiR5rTFm+wz/H2i+49j+tjESPtSD4o+jpR4Kn9Ov/x2peL7/7DdLfmcJeRNo0Z2V7c04dUddgqDAtSX9qA9wOAbx5BwMQILWNbzZeqTp9YFueSJ1cCyzGkRucjzU9jUwyI3aW7sBYFhPKGrCSIAmlFq8xjOIvX+uMMQZ9IV57IRy92HOAwBjp6hkab/PANHYWtPzvT3z7EZbh0WC7HIi8PFTfjBjI0Nq90ejG0bUdFPWy01N9s9wMNxIGcQTDHY45W7jSaqIEZjW3wUXs2dQgThJaoFAlBI+UaxVReK99uICJWYu5MwyFzECoTvsM698ndts9sHFDplsXBkO9mzv07o/VPuBcX0b27GLNRmAYgBhrxgOr722ZAhK0C0Btn95ArEzpolxEsdrr9rfASWOgmXjXsvot+0FP60XFuKaTyaIweMahC4uYTa3NR8F8A02+ad0roJEiZ/MDpcorv2cY/AianonUkfYa932bkTf0M7e6LmievyxPX9HJw8l4h2wYfale9AOS8D3Eq37x 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:(13230016)(4636009)(366004)(376002)(39860400002)(346002)(396003)(136003)(66946007)(6916009)(54906003)(66476007)(6486002)(316002)(478600001)(86362001)(38100700002)(82960400001)(6666004)(41300700001)(186003)(107886003)(83380400001)(1076003)(6512007)(9686003)(6506007)(26005)(2906002)(5660300002)(4326008)(8676002)(8936002)(44832011)(66556008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?EKkv1Rpk+G19tXpkpB9D/rodZW/BXwB9XH60xgnWTD8OWs+ljSxCUpooQdcp?= =?us-ascii?Q?CUqM/SuoBPhO4axFRBYjGPd7oCo877xpLL4hNJV0EcAVHso8CDk2TE24EgEP?= =?us-ascii?Q?WGnG8dAP6FEGdKODeXX8ldvzksPb+tMroUJxYl8aFLtAylfjrowu8JLX191h?= =?us-ascii?Q?XKyVtT0or7nKzg+gBqb7a5rsSKPu50OIEYfXI0kh556wZMg8Mv8div6ZF9gy?= =?us-ascii?Q?nRYasPXThqg/vzaCpzaaKPlNlU3/kcCtHF+fIpY+s5lurTtvLaAckLIlvtV5?= =?us-ascii?Q?JpAnJjmc9UI7WGEg8spoQ8EmJYpalDF45YhuwHAcODZXL81h3eynL3Hm/6d7?= =?us-ascii?Q?vq89QUFZQweL38Iu+gAVhE6gCfTUyXOVO0D+KDgZVRQqG4qWWRqTLAhjDQhG?= =?us-ascii?Q?6wDSRVZoAsjrKosMSxiw+piPNFckvgNi+63BbqZiHEipJLAjVZdgDvfSIZij?= =?us-ascii?Q?WHXhbNYr6JsxcQBpaRtzsjPa+FOY8Z9AYX3wwO16wG0WcCAF2lLFLRBxdTjn?= =?us-ascii?Q?vn01x2zjj9fwGMlKeVL6BSiqRv8Ip2BuDrOTNm6a3LHJ18FDMDtrGw7I4Ec2?= =?us-ascii?Q?NTzoM6pB7sbHt9Fu6Vef58P4zScZx1qyQtVylzetW/al+d2HFQp6ch2QQN44?= =?us-ascii?Q?CgjNwdrkd962JSe7FX5JwyTLXT9jRoFmujAEDgcEyvsUY4CMze2UvxI3w6pO?= =?us-ascii?Q?rYnE1IaIuvaGm5hN+2Jc5gTgoXwKmK4FyH83ediGKbuOAFN3/bg8S6LfQhP7?= =?us-ascii?Q?COzBsM41bH2sPFYfkSkrPydK3tgwjw40cA3tv6zoe0ClHHcC0xd4aidedo7Y?= =?us-ascii?Q?6RelLqp4HxA8ye3oB8lm3+LOf9tqKo74zLZ4OaBv1KPHFO3wto1PX423tLB9?= =?us-ascii?Q?UAsP6SVec1/IcFxkaFeGBrxBFYYYDxal5CrXhH6wWSb3oevUSq5Czgd4NyaG?= =?us-ascii?Q?cKfbXRC+D6MDkGjTq2vVapWi+ruBRKPfDI/CFZrmI7uIg8qJT4XKbIpXqLq1?= =?us-ascii?Q?SvlPhG5E4qEXwnEK9OyrVwUU7xhCsqw7jfWsR/4o0sieDYvYD7paoyOhMIxY?= =?us-ascii?Q?JGcj9byWKRiqFmTP5YB7tTN9zRLF2raY0UybNKaOIUB1r7v9ANqW9YbBB1zD?= =?us-ascii?Q?kSzK2ahz8oTLHmIo4FSPrHjm1skgrUuTo3/yQ/QxNsolItqTkad6NYqKObPG?= =?us-ascii?Q?Fi+4NQxNqh3LT+sJP/Pip12aWygLSpVKmj5akdQg1h3+2wV8F1CdVJJbTDQK?= =?us-ascii?Q?thpx0QmS+3m0GDhnp5kwaNnFTxI/ur93vgbTju+KEicbk3JpLH6rkuC/SDze?= =?us-ascii?Q?BKvLZEUPJtueZpbA2G0aU7sLxgR1CFUpD8IIGBDzk/S3Xhow0YD9pYsp08ts?= =?us-ascii?Q?r/CxIB5hb+h4NyEWy06TxBj66hmXB/0Z1Vl7rLTKtWYI59FgP1ZyKOs+LFOR?= =?us-ascii?Q?/RqjaW7Gvyd0qsDCTXxFOMZlX56tg7eTbIbXi1o/Wx0IVOJqMK+RxjcJRqcA?= =?us-ascii?Q?3H48+HxZfCql1Xy+V/IHrRvXBh7Zg6uj7J0DYSBycy7saNIxtWvbTpZ1fOPF?= =?us-ascii?Q?IpQJkJbl4aGsxpm8iOhlEYSElpExwe0VAlR9lwCYA3LdA8Mqi9pmA7iANkCh?= =?us-ascii?Q?yw=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: c6f4fb9e-31b2-441b-7634-08da5b340155 X-MS-Exchange-CrossTenant-AuthSource: PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jul 2022 07:33:34.9538 (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: RAjo2rKbN09KgFOKA4S6uMb1RwGMJ4mDhMD+g4ExLEJl/zgjiaO2Yny11xvxlq2ET3Ao1wUaS/tCthD9vWss6OM8+YMcH7x4h4F2GQlkrzM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB3203 X-TUID: ZcjL2SVy0kIo Am Thu, 30 Jun 2022 12:41:25 -0400 schrieb Joe MacDonald : > Only one minor observation that I should have made sooner (so if > there are other changes that might warrant a v6, great, but otherwise > I don't think it's necessary). > > [[PATCH v5 1/1] expand-on-first-boot: Switch from resize2fs to > systemd-growfs] On 22.06.30 (Thu 15:55) Tobias Schmidl wrote: > > > 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. > > > > Since systemd-growfs landed in v236, this obsoletes > > expand-on-first-boot on stretch (v232). > > > > Signed-off-by: Tobias Schmidl > > --- > > ...oot_1.1.bb => expand-on-first-boot_1.2.bb} | 5 +++-- > > .../files/expand-last-partition.sh | 19 > > +++++++++++++++++-- 2 files changed, 20 insertions(+), 4 > > deletions(-) rename > > meta/recipes-support/expand-on-first-boot/{expand-on-first-boot_1.1.bb > > => expand-on-first-boot_1.2.bb} (78%) > > > > 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 78% 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 1703a64..48d30d3 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,15 +1,16 @@ # 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, util-linux" +DEBIAN_DEPENDS = "systemd (>=236), sed, grep, > > coreutils, mount, fdisk, util-linux" > > SRC_URI = " \ > > file://expand-on-first-boot.service \ > > 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 c0edde7..31f1ae3 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 > > > > @@ -45,4 +45,19 @@ partx -u "${LAST_PART}" > > # when using systemd mount units. > > export EXT2FS_NO_MTAB_OK=1 > > > > -resize2fs "${LAST_PART}" > > +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") +if [ ! -d "${MOUNT_POINT}" ]; then > > + echo "Cannot create temporary mount point ${MOUNT_POINT}." > > >&2 > > This error message may be a bit more helpful if it stated the impact > of this problem. Something like this, instead: > > echo "Cannot create temporary mount point ${MOUNT_POINT}, > ${LAST_PART} will not be resized." >&2 The script failing always has that result. In fact you end up in a weird state where the partition has been grown and the filesystem has not. Not sure this is needed. Joe did you get a chance to try that all on your btrfs use-case? I know Tobias tested that but getting a confirm that it works in other layers would be cool. But we do not need such a confirm to continue, we assume it will work in layers. Henning > -J. > > > + exit 1 > > +fi > > + > > +mount "${LAST_PART}" "${MOUNT_POINT}" > > +/lib/systemd/systemd-growfs "${MOUNT_POINT}" > > +umount "${MOUNT_POINT}" > > +rmdir "${MOUNT_POINT}" > > -- > > 2.36.1 > > >