From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7114631008580796416 X-Received: by 2002:a17:907:2d2a:b0:726:3527:60ac with SMTP id gs42-20020a1709072d2a00b00726352760acmr4127325ejc.661.1656522008090; Wed, 29 Jun 2022 10:00:08 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:907:1c8e:b0:726:d066:4632 with SMTP id nb14-20020a1709071c8e00b00726d0664632ls101059ejc.3.gmail; Wed, 29 Jun 2022 10:00:07 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tPacZBlCyznbf/cB+EjSCodrGd54tMx7GsjZpNQk+/wAQ/DIMoy6Ewg4w0e8Mlyl8P4r6l X-Received: by 2002:a17:906:2087:b0:716:ddcd:d124 with SMTP id 7-20020a170906208700b00716ddcdd124mr4318045ejq.488.1656522007010; Wed, 29 Jun 2022 10:00:07 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1656522007; cv=pass; d=google.com; s=arc-20160816; b=WI2DHbMuEI9a/8e/ozJjTXaYnnGfzgfif45RFj4+qhf1rGcVEL5c0ftuUuz7yXSHUC k3xzvXtRznwOot93mpGwXeIwDkECSuWVjmbY1ZC0gLgaGATvA8lqQZ/PGgjBQ0F7HSpD FCTVDU72zqN8IQQYOHUQMd76fg6/1fIYZ6JEuYSbUOFzruFvP/pHpPxIUqn+6/Gzqll6 Z/oxQxsJZwD8cT/jyyDEBcMKwWXtrKkZUifgbRqnPneFdZsHQbwePT2otfkqDJglD+ve 7iimyH6gExXZqeh40JVKZ9yJDRAvJGQ1uaB7jdGlDTtHOIfJCRYorIdWiu40lWmdbQgp DKTQ== 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=97z14R2VG/lCwONYGwjCUcjQ/9uSA3KBa0QHqgR+SP8=; b=h3btfW/UC9XQdB9ZiOYYZCD5seAZNZkmymUycPlhOzrB8avmTCuhq3w2uJKScFLt/D 8pGsgzhkqJXAZ0/C8MJ35TgvSI97f0E5PmviW0BxfR8xApIL1aV7+/Y0RaefGewNBO9h d5SjkKHHw8+hwexJh2+bGw5de73i03pIYyj8CvlYo8niRtD/Do9nqBj97WhJS0dwGC4P JLd9VGVwykgTyyqQvY4seZrtBB5bNZ2oRCKGuomi20ARwUJ7V7IwFQDyptKqtve3WO4D 1P5iMXwD6uziStK1w57fdnlJ0wlm5uxqwsqFzDCustFXiV5mqf9ttcg9h1slAnfFFYKm b+9w== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="mV/MhY8x"; 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.104.44 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-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2044.outbound.protection.outlook.com. [40.107.104.44]) by gmr-mx.google.com with ESMTPS id p11-20020a056402500b00b004359bd2b6c9si808226eda.3.2022.06.29.10.00.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Jun 2022 10:00:06 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.104.44 as permitted sender) client-ip=40.107.104.44; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="mV/MhY8x"; 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.104.44 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=WXjY1vdRVvhPuKAequN7GqUwVYhRAFmRbG0gW+f5fqFtRrfQ5b2HEh/lafOm0fCYGEehMQ4Xtzg5q/Nkw6/gb2pxltVLzlwEba3vNigK1qfSjoRkA7OKlDMgtwsBHCwvk9j4N6059R85nHu3G127TkLCfmvsyjiXRSYrrqPXZYJ03ylkxs1v1m4KsKtIpHk7CudsPyymKRarw3oP+ko2Y0VOprMudwkwYcB9iw5x5czuuxkww1Xf+JUIOJxRRd4p3SRXnmeeX3xo2KXwTeDgM4LE9KeEVmBLbmCccYA20zlmhAjBBH/yDOWbv2tv/BO94B9rIqVZV3bcuhXsg+Vfnw== 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=97z14R2VG/lCwONYGwjCUcjQ/9uSA3KBa0QHqgR+SP8=; b=S0uY7wucoSjvnKExLCca9nN1nPhmUSRpZcIYGwq05jkWrlUDS8F3UDEhU0F0fq3DCJ+Ydr7BNrRqx58rfO8OpFRm98YOvyqp3h4hrkJ7Vesq/rI2ZvmGbNP5LZPkPYxbwQjG3Y010aMl5jNl6QAzM9g2U2n76ssiemRnaaCx8QCVMIgzo1vbkpFoYfmrv+mjraX5/WcYxJVq8VPxv6pYV7Kl5x/iW4WgUJxZ6/NbQNoy4nsqGZMtN7BPoaHN6lfkWsp8YN177Ra5clzeyflIVVkAEMRqJlbwX+9AnmMT5Ku3Zrrzqfivl+qMSj/il4P658UFD/ZXHqPI0PIvME6THQ== 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=97z14R2VG/lCwONYGwjCUcjQ/9uSA3KBa0QHqgR+SP8=; b=mV/MhY8xrPkD+IGNbke/MJRl7A3AnP2ldTOwFOSHXhAMWf9OVnXjnj5RJjseTPeWZmXuU8ldN3h2UvSFlhoIWrvF4FY6WjI5JmuxVJ492707UBYKwgnVSlvjS6893pGVrQ5l32a4JOXKHIzQIf2JGHNqv1AfVIXH0/ZXHt+zUKUvSzOVbm6xtEMqXmS1a2Uv2cWsvVLsrx3vyorAT8z0jFSzILTewYlNj9JnGb3RCdPlXwmyhtPzhgEDf8sBDpI4xBjQKkXugT8edk6d+LiHzm8Gzk+4GtPs+93OJBkC/WlDwmQMMygSN00nOpZhVF2L+RsYe8oQm1k9V/DYqqR14g== 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 DB8PR10MB3848.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:160::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.14; Wed, 29 Jun 2022 17:00:06 +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; Wed, 29 Jun 2022 17:00:05 +0000 Date: Wed, 29 Jun 2022 19:00:03 +0200 From: Henning Schild To: Tobias Schmidl Cc: , Joe MacDonald Subject: Re: [PATCH v4 1/1] expand-on-first-boot: Switch from resize2fs to systemd-growfs Message-ID: <20220629190003.66dc7342@md1za8fc.ad001.siemens.net> In-Reply-To: <20220629120144.507398-2-tobiasschmidl@siemens.com> References: <20220629120144.507398-1-tobiasschmidl@siemens.com> <20220629120144.507398-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: FR0P281CA0085.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::9) 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: df9773b0-6d88-4ab0-3e8b-08da59f0d0e2 X-MS-TrafficTypeDiagnostic: DB8PR10MB3848: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: K9XwO2IoI/ygywmLtsxXVOpM/BmCQAzzPvGSUA9Zt2zh9+jyVUOF92F22m+Z3IJ4lws/c4cPBE2dv28JDSWITfjaxD3LZkYHNqOsFiKW/5KBK4A1fEq+yhz4riwvaoj+nNjDraA23m+2/1v4q41DNSw879AmsniTLslLlfrfrZtmWDMULRRF03mmdF2owCgXjc56ruRm0rs7ryjFTpsA+EDq5/8YWbkRtZGaDnw2zStd0Kv1M3vuShpu4oD/DoKvhls4LV8ULcaneerA+OXxNEo25dpCCqo3pNdkpYshXTIwMtMOHi+QFmfgWBVS4Kr0Mi97iq3l4mMOp4FmYAMlthUoqccvW/7d323uUgACd27KOeNGbNoZA7gM2cr1RoWIEjpV3kCNm6zffeDmIryYqSpY4hjXX1XP+4ofOJdBsWHOJcdsq+xcEuvzV7AdqBAFh9YJ1VQiCtj7HJndEpeNz3xtTaGUCuk//OBo2+lbMUxVxkiaa8LAQNVTTZ4G7PuZLNAn3l8CfP2HiwS4eMYxIW6Dv8rztT6hsvKit8MxBem0Cd+Y5Ml9uncS+i6J5qOi2PU5z8oGNcddqpXQX2dmQPbqfKxeWsxWFy8khyQ5iGI5bjD8cJWUtpvN0KqdSQUNfxhZxsWEI7uWtRizZZaASWaL4t3Yne06kCQ5WSvNVfUkqV3E8pXn/sjiTaMhULT19XK2NuOn0Ctv2v/FwIU/mU6MGpEWsdV+/kBco8QmiCc= 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)(396003)(376002)(39860400002)(136003)(346002)(366004)(86362001)(41300700001)(6506007)(8936002)(5660300002)(6862004)(478600001)(2906002)(44832011)(9686003)(66946007)(66556008)(6486002)(54906003)(4326008)(186003)(8676002)(107886003)(1076003)(6636002)(6512007)(38100700002)(83380400001)(82960400001)(26005)(316002)(66476007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?9f0wnqwKKQ/tvMST5YhRlayF3NzSCalb6ugD5XPuG4dd+lzYA4iH16mThqdn?= =?us-ascii?Q?BDfG4WW/KFGiV+OBeEtXEsz2suCCFUPEsV3Mcv+YsAtC71f9oFZKy2nPwdXd?= =?us-ascii?Q?5Ty037UN6gjkO5TrnXeDEtpsTmrvln/BgQMXFpsv1w1B5I3L3GBswJcnLdrt?= =?us-ascii?Q?S7I4pKkmAiOM1K9IXBBsmx4OveWYH2AW89BdDi6VpVi4aOzLCfTTwMHEDF+O?= =?us-ascii?Q?Kl+AfJgkQ7CtpQ/QLgbncfhZbxvFGsXBchpqXsiec0molpWo6Jdubfs2A94Z?= =?us-ascii?Q?He4MBELHUyJvpLxPxVWntmCi9hMQZlp5yQXK+Z3UfG7OGUmDbdA86N6jZnLn?= =?us-ascii?Q?5L9+aDLfsJWSb1+7GbRrn0aHmiTxky5kWmJryJrzxx7rA/pjUKY8EVhIr57V?= =?us-ascii?Q?WY2mO1htOw4UlP5WKh4HWhapLR0Vnn+YSfW/p/vJ4LyCfKgZtQIhnxYKF09d?= =?us-ascii?Q?Wus6aO2T8FI1hmXreRt1g2elqIGp0G4aK84drv5N0/GPglGhiHj5/WgM6qNa?= =?us-ascii?Q?Uo5xvwM/5JChrnPkdOTK2b+1JflyFGeV8Al9zIN/eDYTH86/pz65bSSImCSt?= =?us-ascii?Q?kCcT6w0tZVkNFz29tbypkCxPr6X2tnLSzAQ6T4xrzfQ8Efq4Oj5ItxRr+lWZ?= =?us-ascii?Q?YQYx8rFgGDU0/3hY2yowCuOacqNKuCGN37vUdgKZL4aEjHBpsNUqkQSCKsgx?= =?us-ascii?Q?0VZ6pelDd7RyJIPU5HKhSIi5LdPossDL469DDdgEHV0+f3W+xLp4uXtzycrZ?= =?us-ascii?Q?P46+1+sAbLHW3GPX/40ouacjUXOCFStwqZukr6fy/NHtUkeRCN2+VdFjOaBX?= =?us-ascii?Q?jUBnvTBkS8VTWsluhmSP+eC+wkVxDoUpI0J400YfkNl8pMVNo/d52JpcaWv3?= =?us-ascii?Q?o1ftnWBtrbjUKkO8bcMwYW7UUX0nBJfuAJDuIWaL/6zOWVFESfhq71jtrBPQ?= =?us-ascii?Q?H4qIAKNNrFyuwXf+cOP29nV7KECWpIhQGW0AU3w+SfHy3IUFjFiWfE4Z2t2T?= =?us-ascii?Q?NVZfceYDlpCAvCk6poMLnTRypKRAmJ9EWqtzKfxdtaeTjYM2AuNBgFVrERIl?= =?us-ascii?Q?/bS2yfUI2hil/AOxofUoFdhkRq7NltFMINrOznqczIHv2JfgneYf1zcal9Hs?= =?us-ascii?Q?98HuJF0M4+ZvvFhRKybmKcGE7mkPJhwEddDfxfm84sg5ovOp5kG/3M7k9u+3?= =?us-ascii?Q?B2KupAo+m1CGo5K4WBn7Xek2hO4H/vs1w56ZPlmrcB1ljhs8h0NjTSj/2+co?= =?us-ascii?Q?5E2HaiECeNAQH3RC4wc0co2cNRBUxMSdgb8Yql89WjFP4o0z0hZyt7xasMXY?= =?us-ascii?Q?PUc+qQ9xKH1WuhIBh16Snx0qpGcu4+6DqSVxblrn7/axaARTKlinemDJM1nk?= =?us-ascii?Q?YsorV/7ZNlaD4Ej51+jmDpU8Dz+8S+BsSImXAgAzXnAuiaE2ELzbUC6fw8tx?= =?us-ascii?Q?wrmuGtA6/0FAmChGHC8aSLSbvDpsY78hdqlo+plMMjy0e/gy4bW/gN2GdCCI?= =?us-ascii?Q?hDXiLOMqDq9fRO2lU3ZNYsYynisr7f6g7izCviepBE28tpynfvXHKOUeFcqj?= =?us-ascii?Q?FOxdoJyKejLdBdo8qIirvUYjtxMH9+ZIChSZApcCj+430eEXtVR75At1rg5s?= =?us-ascii?Q?1A=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: df9773b0-6d88-4ab0-3e8b-08da59f0d0e2 X-MS-Exchange-CrossTenant-AuthSource: PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jun 2022 17:00:05.8794 (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: QgKwylBplTtx3H4f8ynXaTGIELJOYiqoWOMjyEjp8y2es2Gg++AS+nqBaUbjjIR2fMxuUpNLEYCfButCV9xO6N0smj0xL77PvUfAdf7C774= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR10MB3848 X-TUID: 3susIy8+roKx Am Wed, 29 Jun 2022 14:01:44 +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 | 21 > +++++++++++++++++-- 2 files changed, 22 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..1743890 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,21 @@ 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 I guess we might need some comments here. In the other mail you wrote that the fstab magic string did not work as expected, but i guess that was the attempt to smuggle it in without actually having it in fstab. Does the combination of expand-on-first-boot (in the proposed version) work together with the fstab string set on the last partition? I would assume it would not because the service is executed too late, or it might work on the second boot ... It is probably good to bail when finding that string in fstab, but for people reading the code they might think that they could as well write it into fstab to reach a fs growing that way. Henning > + > +MOUNT_POINT=$(findmnt -o target -n "${LAST_PART}") > +UNMOUNT_AFTERWORDS=0 > +if [ -z "${MOUNT_POINT}" ]; then > + MOUNT_POINT=$(findmnt -o target -n --fstab "{$LAST_PART}") > + if [ -z "${MOUNT_POINT}" ]; then > + echo "Cannot find mount point for ${LAST_PART}" >&2 > + exit 1 > + else > + UNMOUNT_AFTERWORDS=1 > + fi > +fi > +/lib/systemd/systemd-growfs "${MOUNT_POINT}" > +[ $UNMOUNT_AFTERWORDS -eq 1 ] && umount "${MOUNT_POINT}"