From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7114631008580796416 X-Received: by 2002:a05:6402:2812:b0:437:6235:adbe with SMTP id h18-20020a056402281200b004376235adbemr12204084ede.416.1656601395692; Thu, 30 Jun 2022 08:03:15 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:40c3:b0:435:89f5:289a with SMTP id z3-20020a05640240c300b0043589f5289als2295651edb.3.gmail; Thu, 30 Jun 2022 08:03:14 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vWyZQLJIoq+0V3f9u0cwU2apJ3Su0+pBCWvss+Oli0ERO8t1g1iopDbN33xNyClaXiZX/m X-Received: by 2002:a05:6402:15a:b0:431:71b9:86f3 with SMTP id s26-20020a056402015a00b0043171b986f3mr11987725edu.249.1656601394722; Thu, 30 Jun 2022 08:03:14 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1656601394; cv=pass; d=google.com; s=arc-20160816; b=bhmMPJNomeYx200WN3lzAIQloQdPwrcFxVvGV4UKPlsPbPIBgC0G9V7rfuMtiAsfhg Zxzh9a6YXVyhD3LeXcfC4Vb5NMQJrNAkUL6iv9wFaJEMssfnt04ygjJVmpEgRC22CMC+ OFu/HZ1CNJaTAQheT38fSbn/ut7nnujsYcCFpCViMLTnItyBf5P89TePazG7851E32Ye dsIgN3p04Da/E1TaDwZedLQBTpUdtx5gPfWDWPEPgBrxdgzeGAHCHZlit3vZC0IdGnhq YYnMsvt9os964gbLiYpzoBz4yQNrZKZtpg63RsywOC+2JP6LCzG8pd2oFGmX9Vp+7Bhx RCug== 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=qipF7SZZwwhK1MBktKFpkEiXz2fyNGkTwkmwi+kiHL0=; b=HHbJZew+nCsitff5aMpGSfqntBDVEg6SfRiQOqyh+dnbjvHEOWEhzaQ8X1ZMEYITgl 7iXrqUquZ7GOp6tx7T2Ez6joc7VX31Wm2XhpUMuaQFLaTzoeL7l1NQuksJcgfSIph8bI 2PbPlorJYQB3obGBF2TcXJWugyPTpaTrNExtykHU4STgaxl28QCxJcbOV0kMq8qjFR85 hdt8vaT88G36qBljbCWslfFUZsiV5lhc/1xZXzhRwHyU5IVVp0wh0gG44n0Zpfgw9+gN vTbJGVWhSCR9MRgqTtk1M0qgpbjfs1GwyeSJ09sxXuXRYOWzv9A2vuUoeI9QHbAWWiqN yYmg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=xuXi1p4I; 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.15.83 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 EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150083.outbound.protection.outlook.com. [40.107.15.83]) by gmr-mx.google.com with ESMTPS id e24-20020a50fb98000000b00435a7649ad4si994401edq.5.2022.06.30.08.03.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Jun 2022 08:03:14 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.15.83 as permitted sender) client-ip=40.107.15.83; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=xuXi1p4I; 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.15.83 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=XZL1zgH4WoDCP02N+5UPMoSLNIqlRxJ4aurN1vXKFiB5RvZ+nFt94b/WgCEwiBkLuEFcqltdWdNodcrflKBU9sNprmOxKr3PnyotvMv8w2EPdBgl4QSv/1Ib4wSuBhdLxrTU74+AzQdbEcAlo/r2dFXIqwAC177WOtadJrsNwpCEajc92t3DSBaO2Ee8AX8U1fg+Q/SJ4PhtGNBQPJd+8j123eQCMnH5SUci/ssbj4hGImy6jubdO2n6CWqgSJ6AuDjPZmBJ2XAmTuHs7i40d8TXXloUcoADyuLMVOceMyzkYJ115aW027+2gRvuYqRseXCvU8mpfN9k3wfFDHL17A== 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=qipF7SZZwwhK1MBktKFpkEiXz2fyNGkTwkmwi+kiHL0=; b=VvcMZUu59IBpEarsSFK0uJuET2jg5lqmdBDdb8V1l4wjqrOyOBf6fsJyZoODj+UxZPUjcnu/D3quaj5ZX12TbPWCJrx5ep18oRRbLLGXHAkKprFGy5EKby93zJqzFj0PH3L1OHOlHRLYNyiDGd5R54eTo477m0H0zQ9+6xsCC2YHngr4ObEvv0kv1Gpa0sgHTLhbBuBXHdfEGA9oT/584QsTGFoG3CMY+HUSRtXgR2BcCd4rMfDL4PnBI3Ns3TGmxgKduGqjgqCWAxHm1Yws6d4ts4auPnN5WT6ist8QSLQOf8hc50E9CyM4/Czzv0n3IgyQlgK6OgGPWCf9H4o4+g== 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=qipF7SZZwwhK1MBktKFpkEiXz2fyNGkTwkmwi+kiHL0=; b=xuXi1p4IXrq3sxSuCzAFyefge+r7BqX/kDmU+8140V+cNJc2PguMoiS4dSrmp3zlzMe4CMbK1Z1pMuwR/2U0xnuowM7r5ZQRzWKZq7WdxtTwdljzm8/8n6dOwFTLQ0xRxj1+MagfsPy/wbUGuLv3+xGjC1ue8N7LXvOrpWkTZlifN+iAsVrSmEsmKMIPqZqNVF3+eBv4c6irjZPAOArPe5eLgR+0dBKT7Xup5vQltpe5lQjeYBysOOzAG989KoDY4hY10Q4LxFi9q6yAWvDJmXwkMn63tU8ajYF0GVE6htpbbu8+qCx/ngBVg5J6Gn1hWg9gM3a/bX2wjATkFqU2nw== 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 AM9PR10MB5132.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:43b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.14; Thu, 30 Jun 2022 15:03:13 +0000 Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::b925:3d3d:8f5f:c4d9]) by PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::b925:3d3d:8f5f:c4d9%8]) with mapi id 15.20.5373.018; Thu, 30 Jun 2022 15:03:13 +0000 Date: Thu, 30 Jun 2022 17:03:10 +0200 From: Henning Schild To: Tobias Schmidl Cc: , Joe MacDonald Subject: Re: [PATCH v5 1/1] expand-on-first-boot: Switch from resize2fs to systemd-growfs Message-ID: <20220630170310.04a65d42@md1za8fc.ad001.siemens.net> In-Reply-To: <20220630135531.717696-2-tobiasschmidl@siemens.com> References: <20220630135531.717696-1-tobiasschmidl@siemens.com> <20220630135531.717696-2-tobiasschmidl@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: AS9P194CA0014.EURP194.PROD.OUTLOOK.COM (2603:10a6:20b:46d::25) 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: f3c8726c-5a78-4705-1fcc-08da5aa9a7af X-MS-TrafficTypeDiagnostic: AM9PR10MB5132: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: M9/xPGTa7I73LCXle7C1wm7wnycmg1jTDPMIvDTuDL9biD/ZRCZlUd5Xb697/YMB7XUVIf0lDmAuFl/Pm4389LaJylZ7T+pasZ9nJRls8FytoKTAOUf8pDpTqdSSKuCYPwWF1ZpuqdGYLi6t5DOWvG5S2abgyqUdyU2Bj3NGE1PEDZdFJ3Laq/JOlUOuWv7k67UCDH0Jq2j1b3vJ5X5B4AD2LJK5xGsvsl1kVJtNTUOTB/+lu6Z+3g8zFZsyM6TOIHR42CgQwtjDxGw5ct3zzgbSjdqDAbYg5IzJMyjvOT4adqeeFtynUPypcyLdk2jH2nUwhv2ldvaKR7zDlnRNUhcgNchDl/JWOaO4puj89Kb3iIwMIb0v+f5ZvU/cgbb8cwWOwubwv9eEFwMF0qbII6UnBbrQo4kjwU+NGEZwC2S9wFusXOXUf3RdRbGqB/z0uC2xnypCqVN3rVYiWiM92FXBtO49AWm+kOEzl5ULN9T0FOoNz8Z+n+wVwLRjPtFq2lVplOLTsvVQmuEBU1E6FLQo59Qwvyi+eYTKjf9xs+AH0b7BJXh66uOjWo8M6p0jGQjE3Ok8bdZ7bB4uUsnBAHlTRIpfkXJ7NazFVFDh9reA6z52X0f9JfbT/nT7XBQQy+NAbIx9I4lBzP9f+Y4kp4009sGEg1Ms79CoYv5YCUqTymtjb8BJXbe4AGpbm5nZgAFxenMVMEnxr1mUdj4lX1/VVM25LYHXBm43h0CMn/X6kAL0jWGSAprV2e6CtNyl 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)(346002)(136003)(376002)(396003)(39860400002)(366004)(9686003)(1076003)(186003)(6506007)(107886003)(6512007)(83380400001)(38100700002)(26005)(41300700001)(6636002)(82960400001)(2906002)(6486002)(44832011)(5660300002)(8936002)(66556008)(66946007)(66476007)(478600001)(6862004)(4326008)(8676002)(316002)(86362001)(54906003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?XLOapxTEI1MVE76oH24enb5fBqXckAoQqK6K8ncH2UNes7/MpqCZM/jCQNqH?= =?us-ascii?Q?48msx+uru+//rst+tZkQvap5X2tO8eHZOXabTRZnj1TuHmwB0w6VVNwZrsUg?= =?us-ascii?Q?L/EadBE/7rlaXyt4fQouG+71k+VtCbVMSacc7c5hwYz8EcfQcUrgVSwoJRb4?= =?us-ascii?Q?4+SlINm63ml6na/DRfTm1jtN2si5/YO5TkuGdrsWdN5uzeMZHr1BjY5XGZJ2?= =?us-ascii?Q?nk1LjjAQC4y0EvRL3nLMXOkTe+9GSbQe41o+58OYVBPvfHwrTKSEByRY81Zk?= =?us-ascii?Q?+us4T5ahahVaXcJSZ7aPfsIFh5DsXZ0u93j6M88NCqxZDMUuKGlR4t1jZhwj?= =?us-ascii?Q?Vq52pScZB+0DrBmy5PQkSA9vVj5xWaBSD2/30lBo12TmMYI2A5zfZoPPASvg?= =?us-ascii?Q?+3AGTSAcY1qk5w4HbfZb4i0dp3ReS/YzqI8YfExiNQ3ER2NA/jOugDVaSmPy?= =?us-ascii?Q?DJfMRC4hwnsBDH5IXV7mrXjLUQyHB7OsZj7VHyzYY03gIiCupIOKKn2nX6uz?= =?us-ascii?Q?M2I8+QB17WaUl9f3aheh/1DydpZMNNIx0gfcjOZtyYtWaS444HMrNK55ha+K?= =?us-ascii?Q?QcjFuntIL1fXMEqx8LIcol1Kq/8kumHWGxuj91NfVu1WFSK/hFnuiVMsTsz3?= =?us-ascii?Q?sBQJLk0vOcfRqsQ2BwgqLkRWgYUd1i82en2ptPfjhOuugmYBcQ0KzalmPPsP?= =?us-ascii?Q?gi5y5cTEHWdkPi3joY6RX9Kd2zPdAXE3DrtyRx/ifObKZtV5+/I0FCmjnG3c?= =?us-ascii?Q?A4QFMWT1oBpN6DaFewCR1WKPoLsIypLzQeZOksYXa9spoztZtgRHBxpInwG3?= =?us-ascii?Q?pcwfIpfFGBYoZzjOkSyz3N2T4b7n2skWrSQRMQhqOxFkd+iBypE95x/Bw86/?= =?us-ascii?Q?CYlqfgTAyEbsfsxj2W9floDo116oBSvIYlb/mXAwGArzdqmve4bn4D1G1538?= =?us-ascii?Q?qquCWK2o1oa1sErqROJv8QTDEd+9pAdalWJy+JrbrfJk4xbc97WcN3K/vQCA?= =?us-ascii?Q?7R3PB0pAaQpsL5PUNXiiVykgwmzOHjWQCJUKB7/nvWl8SDR3qzuaYcBCk0U+?= =?us-ascii?Q?u1y7acoAp1WJh1EdRTqcgSyG2K503+udozY45cNTdcFl+fAYhaWhS7np3boj?= =?us-ascii?Q?4eHlEEP0PlyxYOroH+vk7tfc1nTUf778Bq4BWpKHGw3p0bjg8Ff12woP0WQG?= =?us-ascii?Q?ZV5zvr1Sej8NGKBKr1NAWZbKE1LP2EoDInM+ufxo79EzDNqtXxsQem/yXv3E?= =?us-ascii?Q?ptdxaHx2SiQAbP6b6XfrtsRPqNDYIIIID2ynXM2xH+w0d8NrRQXm7iL4zDi2?= =?us-ascii?Q?Fq4j3DjnC1bZZy5rXmQKBOpI4cmIVg9wERE5EEZJpq7IbwQ1bJ5Z+6p+Dq5I?= =?us-ascii?Q?IBe8PaS+2+bQ1dCSO2QkQe5E2hGop0FI6/TUwCT8s5B2LPM932/DZFmr1lpc?= =?us-ascii?Q?HgcSVgExJWYZjWtD8s245ceGDQ0d9hePgVSRzJlw0vFXyMg3gnHh8fyOcirU?= =?us-ascii?Q?bQ9V2trI1J7vkVGIF+QJKEc+znWHmy7ISTjpnYRzZmHzWo7S4XCAIQvjIvIC?= =?us-ascii?Q?5u3JUL3k74sU6ANi9Wv4lx2ug+U1ARpPRJiPY9XAmZW8Lw7yCN8EqurQU+aL?= =?us-ascii?Q?lw=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: f3c8726c-5a78-4705-1fcc-08da5aa9a7af X-MS-Exchange-CrossTenant-AuthSource: PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2022 15:03:13.6997 (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: YsvRbONEpKadhcHmEU+WYRygUQk7YzGA6zD4PsHi4d4ZeEIm0VAffWuNZumKvktdwWbwIYr8j+5JVD/1g4PkM4e39e7xuxtyzPAkp6Feh/s= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR10MB5132 X-TUID: H1OYGSPsO/6h Am Thu, 30 Jun 2022 15:55:31 +0200 schrieb 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. > > 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 > + exit 1 > +fi > + > +mount "${LAST_PART}" "${MOUNT_POINT}" > +/lib/systemd/systemd-growfs "${MOUNT_POINT}" > +umount "${MOUNT_POINT}" > +rmdir "${MOUNT_POINT}" Cool, seems that "unconditional mount/umount" trick indeed works. LGTM Henning