From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7158446333307650048 X-Received: by 2002:a5d:59ae:0:b0:236:6861:a89d with SMTP id p14-20020a5d59ae000000b002366861a89dmr10428578wrr.437.1666712066279; Tue, 25 Oct 2022 08:34:26 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:b57:b0:3c5:f6bb:ee12 with SMTP id k23-20020a05600c0b5700b003c5f6bbee12ls5712198wmr.3.-pod-control-gmail; Tue, 25 Oct 2022 08:34:25 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5A3mVwBS6yGCAOuqjSBrKSA8ec7TKtnQVHOBIk0QK4yj7ruiYtQwQZnzvEV6AJXMlvE2JY X-Received: by 2002:a05:600c:34cc:b0:3c6:fb65:24cc with SMTP id d12-20020a05600c34cc00b003c6fb6524ccmr27069248wmq.1.1666712065225; Tue, 25 Oct 2022 08:34:25 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1666712065; cv=pass; d=google.com; s=arc-20160816; b=cL0xI386eFePI4IxAUGaFfouqt+PCLUW82O2aYbtXm0e8c70qwhDCCZ4SfReAyT+2g AG3bZa7UEsmTVmMOxWCqRW+L8Txcmo2bHV88FniKxHrcOZxgBdBfP2cJx1U3Oag65HVA hF4fEzzZeSOc1ZmOBfVZBPcavkbdK36O2kXCwlKMyqGU57uTcyAWIxzEOLPRQHWyAGeL vIY1r0ZSWcG5hhenjTg4EKVl5Cdi+/NekNy9fZhtlHHxA+Kdit9V80E28/gN8Tvy8jol BHW/NYmXEdk1DAi+rSC5jBTEBfIFXvXHFjStk5l1TJzW773NGhuD4/nKfsBYCwBkLRUh 8+Mg== 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=0Ps6EYUGAR5wne5kfNw2SAN/ZxS3CH2WDGVKVqO3Dt0=; b=ElU2hHzxoeom1IrZB5MnolPkjfvcv3cLj5poijDghl42A48gsEPTbhRewGsfHDDTlU FCvkg2T7GkykkW4QyTgSVCGqxOSlGnIHB+78VAaFb31rCpAU7slyI2Fwg14kdfNVLLjU gJfdwY/jqjNXmYVDYJ+o25HriAPECXZZod/FXAzeKMb6wM1r9zSMJdjlmvCDcP7hKsvz phOVq7GyAJGkf11Re2yASNhqjFR567cROJPkoEN+Fg/Jgvas6O3p232j5A/XbJQGUlHc w0aPfOhr0Fm+DAWlepdSokFvvVpD5j026PSohN0H92NwGUzCvndBR2n5VBI3Gsp9qtRC EpYA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=FrmWHIem; 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.13.58 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-HE1-obe.outbound.protection.outlook.com (mail-eopbgr130058.outbound.protection.outlook.com. [40.107.13.58]) by gmr-mx.google.com with ESMTPS id z24-20020a1cf418000000b003c9a5e8adc5si406735wma.1.2022.10.25.08.34.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Oct 2022 08:34:25 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.13.58 as permitted sender) client-ip=40.107.13.58; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=FrmWHIem; 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.13.58 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=BrG6zBB3k4mRuP0rBII3AxHohYXe6N5ujLZqU/tZqd55orY19+I/IHr5Owcxu47TUkUk7VpaauMhrrdDiQoMnGXQ7uBHf0Lg8nZBKRoPJYKtHW59v8n6T/M1gRpNuOvIv/Ou+vxCN8Tm3+fMt8/SMVHrXg9BhjBwJNEkIaP1v3UbeTFvE0VNkgzaslMI+77rv1pucaZnoV8jOwHAi3yDbX9vJ1zG5TTONfKUNkGLvQNNKJezJYsAjxNc5s+3N8bDfp+aGazEbkKo5cDNK8UyzeBpu1zPh/WdNHvH/WYH/sgsxFIEAApkvEcPs5aZh2ivKn14m0hURp5jwIN2Nnw5pg== 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=0Ps6EYUGAR5wne5kfNw2SAN/ZxS3CH2WDGVKVqO3Dt0=; b=Xkq4n2auCOrU9Sjgogc8QSgUUY1j/GluGYvEsY2aU0NwttXQYDcdShB2g6atFBZ04JO3+u4PZ7iakCshTWZ6Vee/ellQv2TqALD+zCsS72hI6Gi7lNcr3V3YqdEmuKljtjVtTgZYRzUFyRedzAKTU1JqFbKPk5KO+SmnuAKKRoPcCapwulkCeXYE37fNyta7tZaharMMUZyYRXDL37ZZRLUBhLpzlB37zqVlw+NoqEOsoln+V7qst2lgmFFYoPpX+fH3tJM/niuzYdU2yMipT94UyvINQaNk8qOEnxv6+n6FeHkFH9WrHYTtGYLOto3wyazBLw7GJ78yCwfjN6L74A== 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=0Ps6EYUGAR5wne5kfNw2SAN/ZxS3CH2WDGVKVqO3Dt0=; b=FrmWHIemJ3qcNIJf90OFyjmwFfJb3jFafs71bgL/jkmeiG0xAykLs8aAoRT1KtcMPIQlXHuOxaGvMFNbtXgyML0ct8tjtSnJE9XMVJU/5M27vxZrFsuSLe7CFY2IjSFrBEPa3a3072NTYebUyoFRJa5FNDEOToUtLvelZtHAswnIJ+3kvaWrdSNMYaZivcnrxYTpvaCuEIosaBFxaBri8yNBJ7QgfjLlZCPCrhAk0f5tT95ngJnAvPx9yd4gBgdHssZ1pHXdr8lvtmujnMrxB1Xh0ZAbzhcA4X6A/ya8TNiWzdPkTUDYwQYH7iLcP9bDDNHen6S0gQM25wSo85AL+Q== 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 DB9PR10MB6423.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:3d9::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.23; Tue, 25 Oct 2022 15:34:23 +0000 Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::1cd8:9066:48b1:b1c2]) by PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::1cd8:9066:48b1:b1c2%9]) with mapi id 15.20.5723.033; Tue, 25 Oct 2022 15:34:23 +0000 Date: Tue, 25 Oct 2022 17:34:20 +0200 From: Henning Schild To: Cc: Joe MacDonald , Tobias Schmidl Subject: Re: [PATCH v6 1/1] expand-on-first-boot: Switch from resize2fs to systemd-growfs Message-ID: <20221025173420.55ceba1f@md1za8fc.ad001.siemens.net> In-Reply-To: <20221025134720.22571-2-henning.schild@siemens.com> References: <20221025134720.22571-1-henning.schild@siemens.com> <20221025134720.22571-2-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: AS9PR06CA0452.eurprd06.prod.outlook.com (2603:10a6:20b:49a::13) 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_|DB9PR10MB6423:EE_ X-MS-Office365-Filtering-Correlation-Id: d90954f8-8b2b-4f86-0a43-08dab69e648d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xCDI+7ii8D9FjonzzNm5yW5muain6CVBMhZ7XzTNS2MshMP7NWWmX6FLDX2yJIG0ZJkSTZ/RCE72BeRnV6Ntvorhqr9VwuE/VyHHgtqbgejaEwooQotdJHzO8p2MPP5NhFclkYl1unlMWhZk4XkJ6Hbj1r16AayufiB9Nv0GQyrSUdM/j7/5wRa7Eusp/iY68Vyghr4J9Z3FNuGwqJsQFTN3LwI/o8ezOu9vVNsOs8bsvzsvN/thpQlctG3RjrQMy0i5U919VvdNkCHC8LkO+Zf+7QlOC24JJIxKTxEFUs8OZBhx8J5BgCPYWcpJReKbGVO4yNGcq9SymtXAK/hxWLlaA0Tt105Kvpbd7XxUcKBx6N+eF+NMkHrN7kiGLywpia1HXQK+83w6dinCgAcSUAHKnk4t/uaxhL0s33fXiDKdsPAhV3o06J4y3gj53WyczXetdpL2do6ARNqZ2OqFJ+aUnoxp/NsFYgRA1ahtlR8KrbcaIEVGVJN1eTby14VkeejatT5Bc8UGPLnc9mFMOyzppYz0JogVF/vJLriq1DNmZAxiGw6zukjYb/70iiQN1O60bO/skzOGSZRCsD5EG/rGusssIKVkXVOZi2OMCfE0JrKnnWXkVGBiX7gmW7GIUm/0mXmygcg7eDzptc6sxQ3jnvvt2D0OacApjjgQlydAlqVtMRLoNwPiM/ggk5w2ITiBBMNfcl0WJs1Jy0cnJw== 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)(366004)(396003)(376002)(136003)(346002)(39860400002)(451199015)(66556008)(54906003)(316002)(6506007)(6916009)(66946007)(8676002)(2906002)(66476007)(4326008)(186003)(9686003)(6512007)(26005)(41300700001)(1076003)(8936002)(5660300002)(107886003)(6486002)(86362001)(82960400001)(83380400001)(44832011)(38100700002)(478600001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?hG2aEEAxcGDolkY5uP2jLtyUd7UzUnmJ3SQwRxps5uBulGsfxZz72oSHLRGd?= =?us-ascii?Q?PYBUpGfTfma8wVkXnivEvsIqku/S5Nd+szenk7h7JejfZHkp/k2K1u88JpM+?= =?us-ascii?Q?3nVp0Z2phrh+HLRK/E6MpQIhdbxCOeIj87Y1s6aSElGFwIlM8n+zbYaLiecO?= =?us-ascii?Q?XS/VXMkY2OwILo5nKDzhV2fVHMxtJIByF/nUi1gDykle7zHUzk8zfHJ2DrvQ?= =?us-ascii?Q?3sT7F6fAlmLrdiYL+M6u0sbQ9uCjN5cI4SLy/+a7OLw/y02waC4TdW8JtJ0F?= =?us-ascii?Q?qq4mNNCJ53TjVQ/3UAyjZl8uTW4RMQee7cNqtATtOzyOGZac5Yn96+ACdkqv?= =?us-ascii?Q?w3iqiKNi1LoWT4FpLCaHPOBsOvh9ZNLdQgmVzlnzuX8e2SQrRQprIAWmXQIT?= =?us-ascii?Q?9n+QKHFmFbqF54y29qSwkhO+X9spgyrG9yDOtD3BQLIUQXKLu0sDP6VdOyYh?= =?us-ascii?Q?0xnzLD79LsKA+3SWUXbr6rzGWDzmXp7Q52dYVbTRaTOyNd4iBQdcXDhoWogz?= =?us-ascii?Q?jlGfEM+jJujgQM3satYbXPpfAJZ3LM/15iZhn0nvi3emFzws9oGHr1lbiTrv?= =?us-ascii?Q?Ja0X8AsqK0dQn8oGLhN04aAi/6Mox1W1p67y4Bpo1tVcunmXfftT7w4HKWkk?= =?us-ascii?Q?oEJulXymHB9T7a1CTMkyhpUZ83m3N2llMUZCgAH1oCPYlogGyoHkvLxxMMWz?= =?us-ascii?Q?1PJSuLWWxhvP736kwyHoIMMcZpsDlFX0kOwBTLtLynutyvXVcfoIN3uU0qrO?= =?us-ascii?Q?bry1arIEf73jNeppw3va6pnqKRPfEhB6q5rxf4LrGIk5jd4gEpHmWKwhZX+N?= =?us-ascii?Q?k573IBFzMYgQ0GR8Px2DcitpxToOsEFXdfchIeSacSeuIogklNOxO7cUXkZi?= =?us-ascii?Q?n5W3lW1Pe2m0HpUZKwlPXXtvNHZRkwWy3ouD+aA+nh9traW/GQs9xNt1zCBD?= =?us-ascii?Q?NCWZqGRpSmCU4Ew/oVxMdlZJ7HGPjbE75ijHsF7+i04Ywyx8AP8Rpxg0IOD4?= =?us-ascii?Q?7pI6bnXd2CmpkreDmug7vZtjtaxwfYtGTAlDDAXGk/46+9z4guCzp4Vi9ujt?= =?us-ascii?Q?kIeAnbKJyCdHogvkldEYUqDCE3JH/MI4eD+oTjPgidFAW1+01rpStIiHqwrz?= =?us-ascii?Q?x9y3PzqLgh3xc8KMyML0+VeAAPCWeS0tz/TWgeWFWSSrAnscI/DBxcCQ0g61?= =?us-ascii?Q?N2kxI/loUDSGfPMq6pQIKDfe0YXUG8qMO3heQ5LJr0B78pbpr86v0XRxBXMW?= =?us-ascii?Q?OMi8aeo97lQNxoTSYTKToc/Br9sNNiE+OmWpNKLuLyarRF4I3v0C4SsbdlJq?= =?us-ascii?Q?mFtg0tDnAWT5hbV5QJOUojC3hAMkd5ikyAnr2fmsR24wW8Dupqrc/GH0H8lI?= =?us-ascii?Q?DGFm6h6qUCepjBmJx93nRXJVX8aodFKu20Ru2/V/lI8pp8PNLtuUeyeBDnRU?= =?us-ascii?Q?G/AnuWILCJNOVk5i0yVDZERoFcTLnUqEZlFKE0I5Zi5/RSAVlUz4T4lcLu5q?= =?us-ascii?Q?zI51b+c9dUv9NHCHrjAhG13GEG/WltnE1/uls6OsJXeIgcw+rrW4S6rZ+ga4?= =?us-ascii?Q?Vbh4SAYwL1lHks4exGCNWnRdj2yOCp5k68nswnXjdeAA7JYDtbHo9K6cafBk?= =?us-ascii?Q?pFdtfeyzpVjW06mW2MO+MXI=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: d90954f8-8b2b-4f86-0a43-08dab69e648d X-MS-Exchange-CrossTenant-AuthSource: PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2022 15:34:23.5492 (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: L0eOJf8YZa7EO5rfHvK/JquAHRycuwXpWaaqD6jkIz7o3OGJPDPqXVkODYztliRXHrr7gp5m7qd/p1WtdV5PVZ/FrRno+gd5jXJqmqd5YCg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR10MB6423 X-TUID: lCAnUfM3ZjKG Am Tue, 25 Oct 2022 15:47:20 +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} (88%) > > 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 88% 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 1703a648ca27..8d11aef00927 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, 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..046a1394d213 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 > +if > + > +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 syntax error ... stay tuned ... > + > +# 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}"