From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7021952409904611328 X-Received: by 2002:a05:6000:1101:b0:242:6fa0:d5bc with SMTP id z1-20020a056000110100b002426fa0d5bcmr8585421wrw.351.1670600429256; Fri, 09 Dec 2022 07:40:29 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:2253:b0:3c6:c1ff:1fd with SMTP id a19-20020a05600c225300b003c6c1ff01fdls6530668wmm.2.-pod-canary-gmail; Fri, 09 Dec 2022 07:40:28 -0800 (PST) X-Google-Smtp-Source: AA0mqf7Ns2qtU/tiJNQiaeNesOLKxB4zoKO4G6PsflfFxTmBNsxFepsI2YtNEagEHbj9bHiB28OP X-Received: by 2002:a05:600c:3c9a:b0:3c6:c6c9:d75e with SMTP id bg26-20020a05600c3c9a00b003c6c6c9d75emr6850274wmb.0.1670600428112; Fri, 09 Dec 2022 07:40:28 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1670600428; cv=pass; d=google.com; s=arc-20160816; b=y8xYTp7+F3rhYssc8A2CFGshypNzfmssFoVrUBnN0U6oLZy0oaI9lZC1DX+coRozkF HwAPuYezEpCUNSbhI35PHMfaEYz8R0s4tVQ7JAbW6XCxRov4KgTa3dJUC6nZbOpt5poV /SQwpxuYP9p4ZF71Rb0a4rTGOFhcNhppwk2EN9WdvlSefFix6neM9mgucCSVpv+MUHym WD0/Mp5BCCUAfe3rVRnB/zeR88oyKbNg+/Hl3+3kjxv7EV5S+bH6e2aXT2Jf1VVun5W+ 3bFTw3s25C4/yf16m1Xjbt2AYJHrazX6X9q6lLiZ0b/cwhT/9f40Gy2Xl2lAk6d+p3Xv tcmA== 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=YnhQ28ekygm9tudf7eGMfu/Nq/mo1wdDa9n5vBJF814=; b=CUREEPn5ynrKK7npO0k0ndSc145/ybW/YVurlFXasgvVcsKAGf5lERdierb7F1zErc /hLmPt5eA/xQOQTu/OD4p6jfPCMuo48bTeRIN0u7+ewkyqAwPVvXMnSTHXAer9MIPwBS VSKWuPCdQ7PzdzXcEz3T44ZeS1fF6P9PAQOn5V9GXEj9jT/ERQuoeRaTYpYiCExNJvMp PPLCwfPNDZ6QeO5ZL6uHBnk5oIm4bK/p4ndN87WaMoHFZ5VwbJ7sv0MbDX5UMqSShXLP KhHaOTQXtLXzUXmUahrgWkD4XN2CIIzzu18gsmDR13wGMoDyq2DxgvIpK9tTarWZGF1z ePQA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=v0d9bYDk; 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 2a01:111:f400:7e1a::62f 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 EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2062f.outbound.protection.outlook.com. [2a01:111:f400:7e1a::62f]) by gmr-mx.google.com with ESMTPS id 14-20020a05600c020e00b003cf567af88esi8407wmi.0.2022.12.09.07.40.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Dec 2022 07:40:28 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:7e1a::62f as permitted sender) client-ip=2a01:111:f400:7e1a::62f; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=v0d9bYDk; 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 2a01:111:f400:7e1a::62f 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=mkVROf3/njnVINKwWou0mGj0VLjanvKM+SYlJXmHte/8Vb4g9knskdGqD9Rh6Eld4EWQH6809ZdFtcCr5md/UAb7qTWGBYtvGGJ2Vgf4B4v57EAPIB6db8XioG3TmlDTtrspfjJgpBF/gRcJ2Mr4P5/I+ZuolhL8ADC/yhDOTrx6AURrPXQROE6+goAVeXXoq/4THBGpTE/HI2Py2Rs0gMJjExZ8+jAmxOFfaAw+ThqKFZea5szos4F8sflaLnnZgJtquKXvSc1e3hBpTqbhEDMW3WQtWBVD8pnGyoSQ6vN7LcOE5oK2LvXjIhTouPN6+lBYyACbHseOyhs1/7TPaw== 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=YnhQ28ekygm9tudf7eGMfu/Nq/mo1wdDa9n5vBJF814=; b=Wz8azkx4wuHgmNJ1HZfDRvOsIeNDonoF0njbgSwO7HPhzu8DlJrsVKM8mSN5Nhv28545Lshh42rGCPYnlfEwPaVEacZKesqUmRYbxrHQpI1wPnEhkWxQhcU5u3kXhIMjjlA52LfR598N37pxRJqRFAD+PKIVZwyxtzqqYO9idRaqLnbtXTlu89TnCQZzmOM65EfR7nxY0kh++dRiwVoC/EJOraJTgqsqNkr4q6q12LaFc5pmSZsdXLItwx4ji/Wb4retMnSVAChyW5FxhJaw/VzqRbNoxQwwZDoqUEfxyynsKkLggWdWv8tEBOYjhq/bmQLmb1813xZnStzGkcSPKw== 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=YnhQ28ekygm9tudf7eGMfu/Nq/mo1wdDa9n5vBJF814=; b=v0d9bYDkGGH9vbi9Nol2eCHEE5RlNi9YxEYk8BgjBfDj6Qz8+P2OXqXrc3rxAiJ09ffv5Ltab+bc3vxUgt82hJ4EkICpnyX9IfpL6c24cIFZtJJMFrsRqg+mdwatPgEk9bQfMSbnuFEpaDYdo3XpQ9pano8WcCJpcOZxwUXv8WWYikyR+CVkZfxzGLprwAEHll+2SiZTvfZLkNYML8WMKC7F0exvgMsMruZanJBB4TR0ohl4pzYW0zQfZgitv2KLzpHeuJ1XtqE4jtgxAv8yJTJcxF6H0KCt411IYst58ZAHM6l6M+6EH6z/UlIpOEvWdTK5KAEyhyZrbOE1vHGxDQ== 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 PAXPR10MB5687.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:246::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.14; Fri, 9 Dec 2022 15:40:26 +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.014; Fri, 9 Dec 2022 15:40:26 +0000 Date: Fri, 9 Dec 2022 16:40:14 +0100 From: Henning Schild To: Joe MacDonald Cc: isar-users@googlegroups.com, joe.macdonald@siemens.com Subject: Re: [PATCH v2] expand-on-first-boot: support resizing a btrfs root Message-ID: <20221209164014.41bcdc55@md1za8fc.ad001.siemens.net> In-Reply-To: <20211022195047.262589-1-joe_macdonald@mentor.com> References: <18299964-6809-d6a0-0f90-3ec6a785695c@siemens.com> <20211022195047.262589-1-joe_macdonald@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: CH2PR16CA0020.namprd16.prod.outlook.com (2603:10b6:610:50::30) 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_|PAXPR10MB5687:EE_ X-MS-Office365-Filtering-Correlation-Id: 87f665c7-9d85-4ef1-39c4-08dad9fbb13b 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: NaYhpZui4P03+IirJvqAkjNOOQ/PTzLIZBnBzDkgvXTJoM01WGhRG5Etim6a5h/CfIT+hYEw1Zx6Ci7XNJysH04N+1sMruX+InL2tU0PiyldzRgpdjPrxibkfwDyt4EtKQqMNHbSCoPa8s/jXVv0cPY3+RKo1KwCfLj4X0qWkW718BXvvcQM10bskzhVgZqgFBwEDlBSQ0TNqWyYI3qWdm0YxmlIJij1XxQN0/PJVe+QXJkgW7Lctxt0RCJ/k1PZqjVvEK/k3fTazClbDsGk6cvcct1BWBgJxA0boa/DRdqqV5t5Ta/b78vOr0StOvA6AKJ/6kIDvrdPoW60Svb78Com9ZfQ6fkB71hLKgcqxeRvnmsxoegxNHON5iH2fcphbYZF1ASNQ49bt6+1zulOcNnXvC1oN3VjRzziQ6EiOxt3yj72qli5Jbg99xYCMpCAO+4Inz6MErxhrmN9EjZgVFMdZPjx0tYmBV42MeUt/Bm3C69w6GdDTjfeyExhxuOvsGoWCXW8CfjKaxhswMocm10j8jpm80Vtne7xpoPj6Kwj46bP+GJdotvUTEVuXA14frpngSVlDcQiKWDKO7L9eZtPdWmhfoYRehDl4h+u2Uht6g8DQneXPBrpuSKRPGUjUcXX0fh50CdRp2/dm6k6mA== 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)(376002)(39860400002)(346002)(136003)(396003)(451199015)(1076003)(186003)(41300700001)(66476007)(66556008)(66946007)(478600001)(107886003)(6666004)(44832011)(26005)(9686003)(6512007)(6486002)(5660300002)(8936002)(316002)(6506007)(86362001)(2906002)(8676002)(4326008)(82960400001)(6916009)(38100700002)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?AC+zow+W5mi9BwzM0g4e0ZFwXVv2Y5OEGqZz8/EBbCRbXvnUpoICZTFcW9UM?= =?us-ascii?Q?WKBLS0tZncrCz6BfUiHRMuVFxXD/BLv7a1Wl9j08pz2JEtRYkixUuQNIVnwk?= =?us-ascii?Q?tPB5A6K4ef2Uvg82LJlgm9WclTsuB8K3K01I+8aTnhGmq2Xt+uMF4kBLsyVx?= =?us-ascii?Q?xJ5MSeXmI1i/zJ02YqwIqG8P2+UGK+XMv90GcAFkLaftrmR8jI7gDHd3uBj+?= =?us-ascii?Q?rK1hzAvLoRFMiGBfUV8uaJRn91rlTELEJKvduyWjZwXd/sAv5FTj5rEfqyWy?= =?us-ascii?Q?HubacXdXBdCuCWCPTzmLoUvBIcFvu1wU0BuLrHmqHotkabVOVOKZ3h4riXbv?= =?us-ascii?Q?EUFjkm6MAo+X/zDjEpq38SO7ONqa9pjmM9k9nfRnBDmJToQJ61gBt82GNFUv?= =?us-ascii?Q?cFHf0huckv7eL3Q2a2GKAw8FJeTGOX/vYwvOyQo4bZqL/D+5nQGT7jNI8gQH?= =?us-ascii?Q?dbk8BQ4b/z6mUsP0tSjWkapVBMB9j4GxXBGPX3AoVC7cEQvc8oLsApLyixvn?= =?us-ascii?Q?SqtKFAKQqbFSXCf5+zflVG1IaVxWz7c9hu0U8tnPW6RgVK9uPd95LlpaSldd?= =?us-ascii?Q?Xx3zrSJBCB7uQLoCuXWQjxArq5aZ4Xe/IMek8MFMMffnjT2dNskzV8joAu8D?= =?us-ascii?Q?0bKBqETv4tWrHTPbtsQFZ/82k1SJMn45BhVX9zCmsbEhaLq4wgjZrxGUCl3J?= =?us-ascii?Q?rGiM3yc7Omf4c//XzXuJF2j/5J4fv+1xTmSpyywSEk9zBCQbrJkK4iORGgCP?= =?us-ascii?Q?8L2U3wHRBmWN8wHNSFnFklgl153ZVoxoHuXT7tRQSDKu+xb4HHkpuu+0jUrj?= =?us-ascii?Q?eEhgkn86yL5BBe6msLDIi3LoX90cLrtB0AwAu7KdWNCZkvfa4GTxGz4qYZTH?= =?us-ascii?Q?Irputb3PSkdFgXBmob5B9GNq5SvsNtNQBDAmt74cEWSJz3IOA003LcSbFUzR?= =?us-ascii?Q?yeGrbyhpaEKviY4N2jOtxNHxz3WeoWnK4seQ+xFx0dSqGgcRmjHoO7QgJlqe?= =?us-ascii?Q?Xxf4L9uuqv/Z/1PtqPSbvXpLrXu2GN/dDHc+OtR4zVD+TVSUIDKRm1zksKvF?= =?us-ascii?Q?2RxrXiUUp5B0OzVqJ7f0gNCpezdTsJG7gzDJ0I+fRdZp5vjUD5+2yF89GKa5?= =?us-ascii?Q?Z7onSz4vBnCvfD06OVRigtuG0IBuJLS4Uld9gB+feBIX8V8ZcsuW1JesuEbn?= =?us-ascii?Q?PjeRVFiqZNqz6c747HvrxrqpA7iXGWNXu3fOuJf4Uiy+UrE4QAa9GP3zYpgg?= =?us-ascii?Q?dtr20I/tV8FrX7dvxBY3SHYmSsMlbvn8B6ZVlzSv86iHz0neHbcx3jJBVJCk?= =?us-ascii?Q?uKv80dF6RKE4q2D+aQLp7vUGQvAueS+FMLRyc7AcnsNBMOCRpaYltALwsqOQ?= =?us-ascii?Q?Lk93d7DCZob0DkdsVM4ViBzHmgYbm0ZXB4JcFaSDOebTReMbZs8t7+uUkSnk?= =?us-ascii?Q?7Kh+/OWfDvKAQpcM2rpVYfibIMzo1edYvvBEMf5FCSQJb9E1f8Rt6df0Kk7a?= =?us-ascii?Q?VUfAAkUyQCqYMa9UxoyJusvFQ1dbhGkuX1d8Or/ww8aLVztXoa/+mzQ3Wgm3?= =?us-ascii?Q?PgOMI9lUWAF5zQO+vVirbyY2kUjOfOmju4cu7sE1Gm2/m5YTC+0E1gqR55X4?= =?us-ascii?Q?4A=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 87f665c7-9d85-4ef1-39c4-08dad9fbb13b X-MS-Exchange-CrossTenant-AuthSource: PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Dec 2022 15:40:26.2938 (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: WZiq7A22Wm2OF55n7esgQBn2XWIRbvPoqBpxeVEeCnj7On5rS4V/EPZmVQRMdkAd1Df05z2e53rch4KCuw5C4swkoIv2R9XgV5RJaeAVT2w= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR10MB5687 X-TUID: fjWY8jMPlPX/ It all looks like we want to revert the systemd-growfs patch and go back to using plain tools for each partition type. So i looked at this again and will likely propose another round, keeping the author but changing it quite a bit. Am Fri, 22 Oct 2021 15:50:47 -0400 schrieb Joe MacDonald : > resize2fs fails if the build sets the root filesystem for an image to > btrfs though the partition is expanded properly. Since the rest of the > script works as intended, simply checking the last partition type with > lsblk and adding `btrfs resize` instead of `resize2fs` in the > appropriate circumstance allows everything to function as expected. It it not about "rootfs" it is about the last partition. > Signed-off-by: Joe MacDonald > --- > .../files/expand-last-partition.sh | 22 > ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) > > 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 7175dfd..6975d9c 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 > @@ -36,8 +36,20 @@ 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 > - > -resize2fs "${LAST_PART}" > +# Determine the filesystem type and perform the appropriate resize > function +ROOTFS_TYPE=$(lsblk -fno FSTYPE ${ROOT_DEV}) > +case ${ROOTFS_TYPE} in not rootfs but last partition > + ext* ) indentation is inconsistent with the rest of the script > + # 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}" > + ;; > + btrfs ) > + btrfs filesystem resize max / Here it is again not about root. We will need the temporary mount bits from the systemd-growfs patch and recycle them here. Because btrfs wants to be mounted and we happen to know how that works from the other patch. Henning > + ;; > + * ) > + echo "Unrecognized filesystem type ${ROOTFS_TYPE} - no resize > performed" > + exit 1 > + ;; > +esac