From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7021952409904611328 X-Received: by 2002:adf:dd52:0:b0:20a:cbd6:ed81 with SMTP id u18-20020adfdd52000000b0020acbd6ed81mr783980wrm.557.1650614260094; Fri, 22 Apr 2022 00:57:40 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:47a7:0:b0:20a:a30e:f9ec with SMTP id 7-20020a5d47a7000000b0020aa30ef9ecls133141wrb.3.gmail; Fri, 22 Apr 2022 00:57:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxOWur0XKhtfUGlIc32SGiPvjJGNCMF0J6CvGdeZsyAGf51kGYHAebxkBo5BKBQBA/DQOLW X-Received: by 2002:adf:f70e:0:b0:20a:c9a9:7f3c with SMTP id r14-20020adff70e000000b0020ac9a97f3cmr1325272wrp.545.1650614259206; Fri, 22 Apr 2022 00:57:39 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1650614259; cv=pass; d=google.com; s=arc-20160816; b=VqRN3nPO2Mzve29LDNoDaZAGEyL80/a5OXFdYIGWYDaO5TllXbvvvIeSLFRLlbPJEB LL6kLlOdKjLkncDiljLQn25S619uHuIcr4U7rsPEBiyhu/qDfTp7TUrH7Kb3TR+Sw0uH AmS0m+8de8mKLei+CqQbo5fXMpOw06jDY73cF0ZwqJa3xZWGDnhkaaYY6EuPhTCZjgjA jyYliFHV8bMql+xx3aZquqq9S11Zo/05+EWFEvtUaaFXfDXtxV9EfL9LLG79ElgbJ1Af BwxC9LBJV8n5hc/nqh71JFMqv4ovNzNS9d1TvGPF09kfXWMfm2qH8c4vThlgcBKenrni gNrg== 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=emFJNLPM9r2RfK4JiguJ1M9MJGEiQFBHwX6cCdMcoOA=; b=Mw8N5cYTCpbfVQR0tgN3RuWn5Oz1PRK4icT5iOkle7jfHGCvUVMHeqXpwcBvQqqsub mzn/X1GSO4jp5iYtPWBL3ofzfQTDkEDVLuzmouUrMuJhzFJcA7691WbmZTLIGPdf6yMj MROZA3vM4Cfab8+n7oO0iUy9vxDCq0ZDbSTqaocZj2K1kJ8wSAvLCc4BzK1do4DeAh0T Pth8Uf+S66rXjYcyQiUScMAKdXXZBHExHIJiksFjxs3QqkE5A2v7hxwMWbDRDQF4B1nE 3UpyAZc1myn1sqAiKwrgGDOc6pok96h55/8haHnPAAWrGW36l79oBWy7d8Kc0Xh9G6Qo R2dA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=taLuZK80; 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:7d00::628 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-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20628.outbound.protection.outlook.com. [2a01:111:f400:7d00::628]) by gmr-mx.google.com with ESMTPS id v3-20020adfe283000000b0020aa8063034si265543wri.5.2022.04.22.00.57.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Apr 2022 00:57:39 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:7d00::628 as permitted sender) client-ip=2a01:111:f400:7d00::628; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=taLuZK80; 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:7d00::628 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=eJvm0hiSLYhFN3depW7uEPZYFAjOq0w5FDk7dwnS1CB+E132rT9fCdwoad++N//0RWnqL9w3HrqPUI2H7DK4r/pH5jh0P2d5qq2sRDMhd1vuWDJsv4a/fSyZp0O5EHg4Bn9+b6MrsQL90SY10THmd/S4SrQAMKRiNg/a/3i2GbFBvMssfcHExpJrXRxTXZfPhI9mR/GgFFIie5S3YubD8ghNNTJKL2Q2wFPdOk0mVt+GyaMoy5nwd9r6t+BZSoNmwHYiwkgfvUhxgIGiJtWX1HfbeTskAwpJYG8Ta/6wlLj+jfj5kZ+PYAjvWK2HX2IMbuzXZXZ9IwPJPnDu5upXOQ== 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=emFJNLPM9r2RfK4JiguJ1M9MJGEiQFBHwX6cCdMcoOA=; b=Fcb8DQ/pckHrqdhECX89yu884T90HDzQnBlG2nIhwEySO47Lfw+4MgmPM6Nd3nm6RvPxWF5R+8Ruc4CavPGr/qfYDT60RUqxj+uxFTQT48OnO34MIwTIwO4rNVXSy/lS+EGmpDPZXRtot15uM1OsKrlglXES3O+8w6u0k8vwuYBORMGfeyu12iLYcFJtbboJjZ9nfgemcWbQoEr8oYm2/pQtwRx5qGPHq9Uw/0a7dDXCvSxJgm6U8z+5mWBvoJutRUialdduRyGQUxLq+hbRKScZGGOG81U0FWwEy4DqSM08rJr4rX9CAJV/egtbjnBOAreBbwMrtqEuzKVCZwGr3Q== 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=emFJNLPM9r2RfK4JiguJ1M9MJGEiQFBHwX6cCdMcoOA=; b=taLuZK80cm4Dy49o0+HxR3RWzNPL8iJODf+hAhNbTbZiJOyh6vgM8/l5ScosUNVZR0mIB6bpFLTGMbX4R9cCBx1YHyeTni0AQLARfIHGiEzKKvO895sB2k6/VjPocRlPr7tCrF0pNEe4AWUgt9gKVtlopILDE9HuC4wOGRW6vzxmD0wJKQGQ51oXWlUYvlUauPX/Y1VNloSd7LZAnSuUBf5ZoqZqSTG+9gqB3Urx2ju1ucdUAD9uFAyDi29kTfwcLNkWKaWqndk8B+gf6UtSAIsWHrQW2e8kcRrxFTGO+AH23Szw1ulbBWgTypuHyTHQpgI+KVp+mXjb6k0hrhc1RA== 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 AS1PR10MB5626.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:479::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5164.25; Fri, 22 Apr 2022 07:57:37 +0000 Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::f4be:8b5d:4314:c2d8]) by PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::f4be:8b5d:4314:c2d8%4]) with mapi id 15.20.5186.014; Fri, 22 Apr 2022 07:57:37 +0000 Date: Fri, 22 Apr 2022 09:57:28 +0200 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: <20220422095728.410441bb@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 3.18.0 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-ClientProxiedBy: CH0PR03CA0210.namprd03.prod.outlook.com (2603:10b6:610:e4::35) 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: a2497f7e-0fb2-412d-8725-08da2435c46a X-MS-TrafficTypeDiagnostic: AS1PR10MB5626:EE_ X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 97A9gFpPYyAQTjKGm78wyFtUWczZWzo08AcYNHBwCIKay8TowniSyJfU2jeEzlIpvMnZK57GSlphasSG2iwj1vJQcjVHgdeKlRnS8PGeogdjNIhtMuMDEkukkWRNx3zWnfPszGGhBo3kUvcge6ikOHYuiiG8bdHTodecHzPsw2SeNzu58lfxbP9k3ExyYgFno4Y38wuly9ah85wN0tB5bpJBinlU2pFYc0XhJ9v/Ieb0aDAu3oNh1vX2PJw8zkKlZFKtzuPZMUcTwyXcAVHY4Sw/JtZRpv3SUW2me7u+ZZt7sn0GvhgLhqSba/E0KADEC4K8elenK+NjC2rWFy/IZYH51ZBSluK5aGKlJpdfAO7Ww4XeOgCzvbdMxx/IEV8tQ/uQU55Nt6uW/goRbb+fLqMrLrajpMa/dSA4Jr0WN/Q7o2wgd/9ANSXwvlWc1nmo1TPAUitFLmMP5VT/bim/OvVvJP4CCxvCONnxGMObba7NuBylikoJiaIcTsO72IEhA/POzX4W7cQ9o+8fIBJV549/FkNVBc998yEEwmKPPE81hS0izaftNlUZUtCEy82uQg9FC9XzQtrwCZSyvO8+Vih6uzDRI/a/dYZ17fMdqptjuItphBLz5SnZ8fEOkWfGTCfp4gFJaKqmeljwFTZh3etA8h/vjShRr4IQml2wJ0Jzbogwq384GNW3NZBHWUadKwwTpsFUzzmHwAVm+OkLzyXZJ+l96RK5wIVW+t5XvPY= 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:(13230001)(4636009)(366004)(9686003)(5660300002)(86362001)(44832011)(1076003)(6666004)(186003)(8936002)(82960400001)(83380400001)(2906002)(508600001)(6512007)(6506007)(66476007)(8676002)(4326008)(6916009)(107886003)(966005)(6486002)(66946007)(66556008)(316002)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?20l5I5v9g/rnpdNnmKuOQg+zzykXHi9TjSB56yU6A0Tg25SutRa7dh3aBn0m?= =?us-ascii?Q?deuZtKp+LjSG6Xgxr1LH3HD1hJYDku9lidqjbwMPd7MPwKGF27HTzzoo/GgO?= =?us-ascii?Q?/ytrEIg98z2cuamDx8uniytENyBzdksM5XZcoz8e+B35xEN/9ojsQvBdq7YP?= =?us-ascii?Q?VhsBckRfHnA4SN80YyDjNUjCdCn/saUm+BMNQ12qZeo0FCDfAUecFEmm/KEu?= =?us-ascii?Q?IwtiX2jiyn0kQ1PuyUKyr+sL8Gbes1F2Aj7tsKQ4tHYM0Ncec0SYR1qpF92W?= =?us-ascii?Q?XHD82g9OIM6CCEMDsxrzISAdloHcnmN6Y+Iww/j7J16cPEdSp6N14qZWyccx?= =?us-ascii?Q?FRV7YrgaOTULkQSyJdQe0K433xIhu+E3oACEAZe4+MkNt/mlvnleqPpJ+qxg?= =?us-ascii?Q?rGEtD2lBVM1HNoDywLFoe2x9wiDoP9hgDfJXM9DxOJT1D6HWc4VvAXX+BVMw?= =?us-ascii?Q?XkZ9OiUUCzjg1GCgjgcNkqyj7SQ+tY/v2eSPZz8kHa8tAkxGwZVNuyBzlIRy?= =?us-ascii?Q?a/5nnEomsvqWjSbOncwv37c22Z6cQVPwFrJFT74WMWhTdqWDVpVrTn4Ax+t/?= =?us-ascii?Q?A6ZgrFLus8EN56f4ztzuVjM+4IKCHaZ5T62B3W+F7RFptk94robRpsHUl5AJ?= =?us-ascii?Q?/G7x2I6qYbJAzgRRBlmxN4Y27drcSAzV6TuWzNKslzlGhmzOcxgN8RoPC9/6?= =?us-ascii?Q?rhuwSq1XRbruFzgIKrWHdAfNnz2TfFFWFwN3SI8H/G06vbYNnVjExjAsK7az?= =?us-ascii?Q?0Pbra88GA4VY0Pyb4q/dQX/Sl7Bdj0fEe7RaAJVSLqJ4wcpWhbCKf+I7cYl6?= =?us-ascii?Q?sBiEq0NC7RPvAmgKRg1Kj8c5xWUUdtoXSuXBlycp9disBE/i964qXIygSpzV?= =?us-ascii?Q?9bf63gFtIaTNVIkr00utcxLVNjwCAlwjgXERNCOr/8MeFo0CZay2AGoTlA2K?= =?us-ascii?Q?RYVO27MooAO5AP2/3INnUEGURN3Z3fxkwuc8krseueLwXxZKFZQWkZQd44EK?= =?us-ascii?Q?s+D1o9alcOZhXujVSTpfCvkF+oqETgFtLPSBK+LMMeUDCoezqAPQXqBKOKWO?= =?us-ascii?Q?Yu6vedQnmtkiuA3S+ta7GE17HeaeemO1xnDztqCqTyFhEkvzTBfE0hGShyYf?= =?us-ascii?Q?Dk/i8jMtzII1e8wRcL1IQYDaAizfmha7gSYXgdVxOdvjsIGu5tl4/SS4a9HP?= =?us-ascii?Q?Uv+J8HqHt7SgT1d+tXv6nRpcIa+VxjkA3thBKcrkAfs2Kr7BADmmEkx5O59r?= =?us-ascii?Q?SH72zUEy6FnPxqw7gOUZw+mlDcd/eT+Dxz65rBMq7z5ekUhfYfkPJpbM4B60?= =?us-ascii?Q?veKJO5ozuvP1BlmmEKZ8WU9BVxbX16QxHHI9XHnaeSODJL4WDnbnxIU7HMOS?= =?us-ascii?Q?A6OVRqIv+yEVvUn6X5KIL+lBFZfmslhkahU1DmfJweheUs3RLCpPD83ukwtL?= =?us-ascii?Q?b97Pu9Alr9bkXuNQ6LXPSZazRM8L8ovr+WfBPpcCHZcSyS8ok3hiyegFQRdr?= =?us-ascii?Q?yn+NggQoERwXvvdOMMG0b5rXPC5J7+F1RqN717io4wTIifSXw7yK8IS5qt1K?= =?us-ascii?Q?YvFjAkWpMKHpoiVwnhzPABlwEVHdWanQ8z5hEA7mG385hMHk7JkSJpCWHeAj?= =?us-ascii?Q?/cBzR05LwBfQQNiMgcZ4i44l8eHaEqUAxUxD5X+j68qDS20O0+V8nZbTZ7m8?= =?us-ascii?Q?Q5q/IPMot745eBgJKGRbdBe9oXSWv3xWlJhT3kGgc3Qlrbz8SVzpN8y68FxQ?= =?us-ascii?Q?dlZlL6MkhhtRukqVD1qJrrXcpaSYv1b2pWWRJcQejHJ2cqsj70jKzaisrpWK?= X-MS-Exchange-AntiSpam-MessageData-1: vVkHZUT6pIrty/ryFMdiImZsopr1lcZzd6g= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: a2497f7e-0fb2-412d-8725-08da2435c46a X-MS-Exchange-CrossTenant-AuthSource: PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2022 07:57:37.5872 (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: n+uZgXrzWqGOomQjuoEXLSsumMWvwaZqYdq5Qlbn8CvDzQ5BD9Jksxk1trU/spE4piHVeQLBWsQaHcHGkQPw3s4aLBmWxQZ1CNUb55QA4pg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS1PR10MB5626 X-TUID: SEOH4c4nD4vl Hey Joe, will you follow up with a v3? We are having another patch for expand-on-first-boot coming up and discussions on how we could maybe eventually switch to systemd-repart. https://groups.google.com/g/isar-users/c/p5QADbRC3EA Henning 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}) > +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