From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7021952409904611328 X-Received: by 2002:a2e:b0ef:0:b0:279:be29:cb69 with SMTP id h15-20020a2eb0ef000000b00279be29cb69mr14117883ljl.482.1670858664460; Mon, 12 Dec 2022 07:24:24 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:2012:b0:4a2:3951:eac8 with SMTP id a18-20020a056512201200b004a23951eac8ls347469lfb.0.-pod-prod-gmail; Mon, 12 Dec 2022 07:24:23 -0800 (PST) X-Google-Smtp-Source: AA0mqf51MoEJsOqVb+gQMBDz6nrU28xxVrJUKAhwuAT2XCirhE0KUdUbAtTBn3NvS6K7SYj5uAmE X-Received: by 2002:a05:6512:c04:b0:4b5:b90a:829d with SMTP id z4-20020a0565120c0400b004b5b90a829dmr3492414lfu.66.1670858663208; Mon, 12 Dec 2022 07:24:23 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1670858663; cv=pass; d=google.com; s=arc-20160816; b=iedDsOw0IUFeGSQyxrhngxRMsapInrEqTsZSH1dvwfuD+exveG7AB9CHIQZ761yH3F x1BaIkIGF6LauIytvP3mwSN8K2JnJnWMLjj//A4KOTxoHobBuK1zoQ6adcjBD6xajeKC pZMDPGO/FxoXrWL/02MaByGFP65FHqh5KPK1lfhaMZewP6I5dMYu/llhqPLSteOYkbq5 9fFqmxn+sp4FeCx0Zvn/DaSMc6ePCUXAtFbFBRMcAFsvF/iB7cS6hl5apHbrWv/HwzUW Pa6MTnCCxtWWoT858Ri7DFIvUIE3puANrSPGx1x1Rr4ptC+811v7m0E7/tKL2mfBgFUz zXGQ== 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=/uObgglgjgkzN2QjxDv3OmBHAwjtuNyWqjjYWmU6G60=; b=UdqUxz4ChIfnefJsYnI5LttWo27TpTsceD5O2cPhI0hoohyU1puT3gOxxI2pswsB4h oIsAb4+JYNMKheFySuzHNks0VIihho9Mg5Nr9DTUTN+u5BgmdbNvDRy6S0vMHQZZQclt J+NLpkSiOgjiu762iNLCBIy9CIV0C+DLdMQTvcyVEZlIGOYnaLrorx3Zml5a3MIGKFW/ SyMs2fFrZHEffPVQ9fkV+S0dGiE8KBXUSk5mWlhBnqzEfnq+ufntBflMe8NH2ip4JGR5 E/11sdwDO2rEWQU9ror2h/nRVjAiHCBuvsAQ/uwtgtgicXfWLHNPCguv2n8Hog3rFQFr geHQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=sDp2mq9r; 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.52 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-vi1eur04on2052.outbound.protection.outlook.com. [40.107.8.52]) by gmr-mx.google.com with ESMTPS id q8-20020a056512210800b004a222ff195esi4748lfr.11.2022.12.12.07.24.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Dec 2022 07:24:23 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.8.52 as permitted sender) client-ip=40.107.8.52; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=sDp2mq9r; 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.52 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=W+NzmRWil4nnwhEmVCfMJMrBPS0RYo1wcom+faidBZPQgpEPmWnMfXewA5SaYanRtgvaJizgYxFDZ2HrPlcjiaDUj0yLytoQ6NktcM6GAtvi75576sdOQrF4VEi7zbAMoJiPyKRGMqs5l3JOA4wLstlAwN9x6L3DYOk4puC3AXlHq3pCYAv1VxG6oxILVJ5JN5WdKrrsur1o9lGUb9GlkmB8bX4BdARgryhUPfP54CTXDNqX0G1LlE/SzDhy9SVz8066h82C7bLSWHsZOOiFOYgs8e9p5/Yr6Ga7Elk0f7m10TsjXsUiMGHnh/pUPtAzhjNTDOjLw8kFzNwAZe10Vg== 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=/uObgglgjgkzN2QjxDv3OmBHAwjtuNyWqjjYWmU6G60=; b=EFrsa6+aJaRe0wjnjION3eXIkATFIPOBvNuXHzdtUzCeAr5kWU9ZFrXRvnXdoRrvF5Tt1Losq4Kr4Wbo4Qyz6AjJTk3iVciYMt/SmhW/grRruPJxdszzNTGy91rTNBdnwAL/U3jBjioZL3ahwjnZFDRwIinJFePnA56qpuajsiYtm+n8UM2EXm2EQQwjogXWKlKFJlaut5esks1OuqgSxtK3OAL3PiJBk2zQgAHYg5FbQnz0nEvUBBE/av/ZESL1kZE54MI++TBKzCdaHVzUL9hSVb74DJKj1dOEbCoyfylUu5CU835CSQcnAlAzIDYyxVpTty2JQ6nKnOu07JCjHA== 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=/uObgglgjgkzN2QjxDv3OmBHAwjtuNyWqjjYWmU6G60=; b=sDp2mq9roBUuJS+b8W+aa1XwQoAgxfhrLijwMzzGn829428DUlTC+TrdFIo/IcgPkKrUeF1rxevSmCm9huPMXjXRx5yFFHEgdNvWgOtE/kW6JvsTw+UOI//Mk4XZFTIZ0XMtz0QoxFBYMlT1UL5/XEVdkBXc/Qx3lNQn4XNct8P6SjfGv+xUBVoYv/+X6zmeW8tg6dmjIB7JsOlrtv5keqsNnr6nmqRo+cd1tsRuYBfTpq1SRRPCupnZcOE6KJaRvYbcOXy8NWzF9lq8c+c6daxrsqC+gMH6sHY+4xc6qvBtZIuhSBVxLPtJBzl1pCbGOq7CyCnb5+FZ1OaOKUHxPA== 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 AS4PR10MB5223.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:4b3::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.19; Mon, 12 Dec 2022 15:24:21 +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.019; Mon, 12 Dec 2022 15:24:21 +0000 Date: Mon, 12 Dec 2022 16:24:19 +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: <20221212162419.2760544e@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: FR2P281CA0068.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9a::12) 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_|AS4PR10MB5223:EE_ X-MS-Office365-Filtering-Correlation-Id: 49c3abb4-f586-47ae-7121-08dadc54f17e 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: S+buy6ANgRtj8XvT3JLlHc+c8wFfbloOGAbCvycC2IoTbMYY8zDmfQSZbdIFaZnod9GxUjsXzYNzs4OCwEN8Lm4Q+8sNax3r0yqq+a0O/EQmUZwj6TTTYpmRajtyzXlre1Nedu/cpb6WjkoXGHvQaVDS4FE6qC8l/BBlZCkaN5tuJsStzABpex/XDZ8BnFUIBuYEOtnHHqsjB6zVk+wmQD2TFOvnzASq8Kf1MyQnw+rZbc7wyOQOjhmd3hm/AR5lAWMc7htRBrCV11CyAb0p0xH3BdvV0NTVr2nVXKn97lFLEfEui/7JKDv5MoqfFF6nNijHN8Lhwb3+BnnlRhhFnQAYsg2ASxboU5d/XsDbzgP8MMb8GeujYPTi2luaFszUSDc55+10WU0XuQTyjRs+meOMQvoBOXE8JUqY6W91hlKybb/Bm7tpEgDxHkyLwtZINA8PICfbsDioj2GYtHotVMF1+GAt0FrqHwRnGZs0vNHAzBvFX2K2G1nKTbJeOLA9ILktMLmvAOfaUd8StJZn19Yp3L1lc+ZeOIrZVdgJq3gkO75mXnrz/lP1Zs3zSjH+DjsBuy61YXu9QpnWr1+6Z+hQIGsIbBbSRWMLCuXj5bPbJea2TZYiju8MCaP9YEqBwrrhzhuWPFJO2I+6OGzv/Q== 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)(346002)(376002)(39860400002)(136003)(451199015)(26005)(6486002)(9686003)(6512007)(6506007)(186003)(478600001)(107886003)(8936002)(38100700002)(4326008)(86362001)(2906002)(316002)(1076003)(8676002)(83380400001)(6916009)(44832011)(82960400001)(66556008)(66476007)(41300700001)(66946007)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?TtKj2lRxr+aNyHHppXWOC8k78VPHsJSVINRbdPErvJBcPKBB9TZ4RCfxok10?= =?us-ascii?Q?vFGmMWscH16rK/o8S8EirNgYLGuGCybXcaGHAL9KcMA8HMgMCQkqWjYYDjEp?= =?us-ascii?Q?+B9HmEVM2GKhTE2yeJbutgam/bLsBM7EflQ6dB777FGNsCvysXJop5vHzgb1?= =?us-ascii?Q?DWbsKqtJtG/e7Hh6krjS8/wnUiIHBIh+nG0Im+6LuWHy38HkYqpQLojfaKqY?= =?us-ascii?Q?1t+T/kSRfo6bfwIoS81KfjeY8/XVFl/cd5G9tpJnK/oOSZd3B8nHEQTt3iA/?= =?us-ascii?Q?rLeKsou0o6itMYm1bXd2hGdHkmIpniENcUUrvHoiC3qD/Vu3Xv44KAyW4WKh?= =?us-ascii?Q?SzCl16hQJzZyq29npFobdTnz0H+kcNax/p/wduLIK9qMUsdjKrOf6JaKEoTm?= =?us-ascii?Q?F5SeVcLwu5cn9izwEgWtqHGArzc7KKnomdT5n1Kmq1aJ16VUrXnxvBG4DECo?= =?us-ascii?Q?59nrsyUdh/+nY/O77JyMSjtGH//hSsSrCZ1lmK14U6zW3VGGH+chHy8AN1Bf?= =?us-ascii?Q?b6A+4R0M4lZiqqf3DEWGOn+r0uY+wweseWQQs/2B6y/jo0bkl7dlGFNglWxe?= =?us-ascii?Q?NO7jD/bUm7eqbpBJEociGoyq7N18uVMjw8maxXYpLztbIeESkyDO5lWBXBXl?= =?us-ascii?Q?emjWTLxcyvP/0c7R2pI4STiHhvyUwMw5dgyA1A0qFUr2/ttf+Aprh2wqGJrv?= =?us-ascii?Q?8+UqYtH87CFu6vrIgiIUs3v3yH+onUPxgIak6WHuwck2IEOcxQL4TdNgvNv9?= =?us-ascii?Q?PlFTJzukyr66VrulGG6HuvrNBrDkzbkwABaCbMMuiCYdHZCBTMRoHYGdKpgZ?= =?us-ascii?Q?pX3J4A7Ji8JQHA1UhQ5p7+PkTuYnmAj+S+gIwGuqN2LoEIC/utBlKr+DbJ44?= =?us-ascii?Q?xd5lSSSB+ia2/p4EICnCbqJ1kQ/LWB4muYwLfTfkYfkhMqvB7kE4MckMQ6I+?= =?us-ascii?Q?UQqz01uvRAi5LNDMl7bHIb2P58JcBeOyp3OQ4PRfbnVzr7yoAg4FC2DyJ9vf?= =?us-ascii?Q?1+pnJ/dc94weufxxK04VQa6smUAGIhav2JL0ifN5ylWyA8BmcPHYrlcLvTSU?= =?us-ascii?Q?ASwTLG7zk9kL2U8ypgMlpSD/NTvfSiRDMgTewHoK35PogJPTIyHGM6A3vDAv?= =?us-ascii?Q?1QZppAz1klBEIX/FZFUk7T//nlWaGfIdWs0YxSmx2PE9xgPciONIC5yV4LL2?= =?us-ascii?Q?E68CJF4ZdfnBL+5eB44q4Oa+VrjkLG3OZzoh7MALb+8KQKWUzUKZCgtoxqeS?= =?us-ascii?Q?wXyb2D8m5VU/NEMZXvx4aohyImMTHuiMF8evF0zd0Anhnxsu3AxafVAG3uc4?= =?us-ascii?Q?do/qeEzyj56e13tHM9PjW1ub7rudyPeW2G1ba24BORrBP4f8zmGxjAtNL8uh?= =?us-ascii?Q?IqdZwRWZk0utOWtZS10HH1cDQFnpmr3SDd0CXuxEQdhB9N5j4d0/Ca4iQJUy?= =?us-ascii?Q?9e+/k/2xR0KU2A201iQ8YO89ZlGj3w86PPnymSAr5eTQs82m+nO3R0kjOSpS?= =?us-ascii?Q?JYDoPicIdpHwk30Chdvq+fgbVHfOH212gzcOnixfZjLE7CC4GX7mecO0yziN?= =?us-ascii?Q?fKdUPCc8bTJxII4LMNxWSJMb3OA2i6iCL2aLMPspx2pDd+YSmXsJbqFsmqXp?= =?us-ascii?Q?UA=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 49c3abb4-f586-47ae-7121-08dadc54f17e X-MS-Exchange-CrossTenant-AuthSource: PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Dec 2022 15:24:21.4555 (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: VL0atkdrlwW7/TMoC/jI66JHk8I3txp2ZcplZYmNkYHEPaV7iyebS/JnisS4k+Z7x0zLdxCIe0dmBaD+KZ41GaZTOWxezu+1KIfa8IcQ46s= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR10MB5223 X-TUID: oNE6k+GD/8Nl 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. > > 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}) Calling "lsblk" suffers from the same udev race we have seen with systemd-growfs ... only very subtle where we get like "" ... no filesystem. It seems to help to mount here and findmnt the mntpoint, we need the mounting for btrfs anyhow. Also lsblk can return multiple filesystems, like luks or lvm layers underneath. Where findmnt only returns the top. Joe, i had to rewrite your patch considerably. So i think i will change the authorship to myself. I would really like to give you the credits but am afraid to give you blame ... this whole expand story seems never ending ... So the patch will mention you, but likely not as author. Henning > +case ${ROOTFS_TYPE} in > + ext* ) > + # 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 / > + ;; > + * ) > + echo "Unrecognized filesystem type ${ROOTFS_TYPE} - no resize > performed" > + exit 1 > + ;; > +esac