From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7021952409904611328 X-Received: by 2002:a5d:5887:0:b0:20a:9e33:8e4d with SMTP id n7-20020a5d5887000000b0020a9e338e4dmr3036209wrf.2.1650618392747; Fri, 22 Apr 2022 02:06:32 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f950:0:b0:205:dbf5:72d8 with SMTP id q16-20020adff950000000b00205dbf572d8ls431832wrr.0.gmail; Fri, 22 Apr 2022 02:06:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyX2SKUROXDT4NARZKvXpZqEbyIoAV4Mnh31/DHO/ePAlcIsbgFxvTYZJJAnhiRX4S+6vlC X-Received: by 2002:a5d:5248:0:b0:207:a421:1a26 with SMTP id k8-20020a5d5248000000b00207a4211a26mr2842748wrc.271.1650618391430; Fri, 22 Apr 2022 02:06:31 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1650618391; cv=pass; d=google.com; s=arc-20160816; b=OLmH3N/f/BTCfqKnO6DhxCekLVmyw/qpJ9VO8hPIGDwnDlh+e86QVLWgHWRM4Qztsq yUIwXbP8EEB6n/1kymh+kC66p9xVv5kRA0fTmS1/jebx7zLFNjUD+EVeMCJHr5FnhBaZ se+CrnEBYpBBw9P3cfTuSC6sRcdsJRUEjzd+MW30xiVFCXHezW38/9UMxYO8q385mWSR JJ01I0zBeNYpMwsrbyFslrsokdBKyyFMUvu3LcEi7LSttekjYt2dcQNlmRyUNe8hMvT4 +R7/5yrdHcoUW1xvmqRX//zFcbjV6tlfdFyL093piXVP+QnfsQxRKoC4UuvdSQxkiWHq fC6w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :dkim-signature; bh=wUbt64ewrFBr2KjKn+xB1ODKXGl5dOKtSMjxvPHEve4=; b=FtlNf5OUt9+vW9zU0pU+OuNIfRWZTL5qJfM7u+v14zUjZGNzMtKkgrrWuu5nIafFCd 3GNfDv8WYb+CDbJkr5UTJOW0HjVMZ0YQN9GF4+FGJ3MhgoHDubKSG0Bfpsx2valoqpQT EQHH5WRjIEbRS1YBxt1IUikKa7XK6WHUdoXmG/NyvIkiSH395p3xlGZlVm/L7w20Hj55 Nut/9AYb0yqocSFhT6QP2Ll9hsbY353TPJqvTrYg+XprxdgcOHkzk81pxy7uqrm4Igk5 m0Z8yLXBHhm4qXTUaQzzPNnZWlzMWVBbEuR/9C6dGeXh8dHOtImeebG7eOAjdo4C0NNy EQwA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=bPhFdRAH; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe09::616 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03on0616.outbound.protection.outlook.com. [2a01:111:f400:fe09::616]) by gmr-mx.google.com with ESMTPS id 8-20020a5d47a8000000b002079112400asi310144wrb.2.2022.04.22.02.06.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Apr 2022 02:06:31 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe09::616 as permitted sender) client-ip=2a01:111:f400:fe09::616; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=bPhFdRAH; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe09::616 as permitted sender) smtp.mailfrom=jan.kiszka@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=EOKF6zM1MMtM4UyU/tej8kcW/dpr5qNCmBSabszCozl8Q39LdyolwpPLK9EFeAgd6fCXGa7OJf6UGkFzaCJj5BH2u8GPIEnJBC4yQJy8MCCiKjoqhfhbMxqAASS9HCI0pkYhrGAkFHW2F3H+dq0YUq1INmelftuot6BGuk3+AzQVZX1/ZfelSaHI40EQrhgafO2xGsyStiikl5/9c/tjoOITRsPkTq1DcH4QWDJTLUoTlslIdJ4yqihD07zu51SFsGgK1mpPqChaSgWVPEX4VyK3NaRFwKFD8suhjBMAXAtNE8nLILwlyRhOpMz198pKdB/vU7qGQsX4arzA+q0wmw== 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=wUbt64ewrFBr2KjKn+xB1ODKXGl5dOKtSMjxvPHEve4=; b=RVLWhZiMQE4VHby4YS3iDynATuu5ac3Hy//nChnGfiOPuoXjUGkLUTJAWmr/I9QDsWpzdq/x4OcIMOTBlLSsUL3uV1QV8fGzHkUgkeNix7oOX4ZH6UCwrmBm4mdwNHVWsAYBxlDoYLckxUm2Wt6pHNi+Efz7A554U/Qa85nQVkxMzqpcckfCZVJeRoBW6iststZOA8w0+1//lan9tOMevbhj7UgwPnWjSfGiTpaTGzZtcl003FUyak41D4e8GrZqOT7ZUeosgKGhtVz/77a59X2XFLiJq+Jb8qRm/rUjcRqyS7aO5RTOWNwOggb5GodDjgIbKRt2qGnFjuEKdoM86g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.72) smtp.rcpttodomain=mentor.com smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); 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=wUbt64ewrFBr2KjKn+xB1ODKXGl5dOKtSMjxvPHEve4=; b=bPhFdRAHZkxlSIacAuCCbiNmVV0ghSqF3JKgwNMgtqRLYcEWlDZXOtHOQUVu3wFmaHQL7ZaMhrT24fTwy1fXQkAWkuzGqVnsAl8tW2QLD6FBRqOjuvupEtP8M8YOrADlSk2dpG/n13hwk/25shEzE7IAQ1hJoVVy/deT8lHIFqCVNkAIVjYmtFXNNquy8hOPE4esYwAjy2Oe7xgFsl/IYG+GKetO05FYEMHZj1QZDRj7HKjRsipZvhZGCB97TQOm1SYHdwF9E2612TP6qi5fBxkLniZvIcW/MCQS8FDAZpWyL1jAMHBxuv6+mOJ+89iARHWcHOahhtFvxJ3nUP9Fsg== Received: from SV0P279CA0025.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:12::12) by AM6PR10MB2054.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:2b::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5164.20; Fri, 22 Apr 2022 09:06:29 +0000 Received: from HE1EUR01FT107.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:12:cafe::3c) by SV0P279CA0025.outlook.office365.com (2603:10a6:f10:12::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.13 via Frontend Transport; Fri, 22 Apr 2022 09:06:29 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.72) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.72 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.72; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.72) by HE1EUR01FT107.mail.protection.outlook.com (10.152.0.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5186.14 via Frontend Transport; Fri, 22 Apr 2022 09:06:29 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) by DEMCHDC9SMA.ad011.siemens.net (194.138.21.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Fri, 22 Apr 2022 11:06:28 +0200 Received: from [139.22.137.211] (139.22.137.211) by DEMCHDC89XA.ad011.siemens.net (139.25.226.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Fri, 22 Apr 2022 11:06:26 +0200 Message-ID: <4a485b9e-9362-3138-f955-5a249ea0b665@siemens.com> Date: Fri, 22 Apr 2022 11:06:26 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.8.0 Subject: Re: [PATCH v2] expand-on-first-boot: support resizing a btrfs root Content-Language: en-US To: Henning Schild , Joe MacDonald CC: , References: <18299964-6809-d6a0-0f90-3ec6a785695c@siemens.com> <20211022195047.262589-1-joe_macdonald@mentor.com> <20220422095728.410441bb@md1za8fc.ad001.siemens.net> From: Jan Kiszka In-Reply-To: <20220422095728.410441bb@md1za8fc.ad001.siemens.net> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-Path: jan.kiszka@siemens.com X-Originating-IP: [139.22.137.211] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC89XA.ad011.siemens.net (139.25.226.103) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-AS-Result: No-10--21.251700-8.000000 X-TMASE-MatchedRID: G9QKf9eUqNA5QaOxwNGfvo9bHfxDWoibJYz6ynVcrDC3RxL+7EfzsAD4 keG7QhHmgU38wRbnPPKfUDMAh2QVUfqsYy8BzPZoUu22cG3QolR/wY3UEtU7dvSG/+sPtZVkFp4 YCwpWQx4R34ro7k23nRg6z/MzaOE8nClww41vhSyD+AvtV1q7s4Uetd3Lt2zGyq0aou1D6WxVre 9WjqqQw3rnJezHTcPEyfI4BoNCu2KWUZ8hSpC7vSr80cckpha3adB+LNL4mHAD2WXLXdz+AT+k5 IvvZ1N/CwWRLqiC/Ur47Xv617HbR3F0Fw8PzzkSE/JbUmZTmPmRbv6Uv5JgIBwu4QM/6Cpy2FA7 wK9mP9d8ykEkH9BUR85sgnuZ9hfOwfolb/M3gEr7oAlJCBIVEioz5YFriWRsbl4CKqupkMr0VPv T0zx0mKfub87GOZij8P7ohAxHFTni8zVgXoAltkWL4rBlm20vt7DW3B48kkHdB/CxWTRRuyUIay x+Skid X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--21.251700-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: 84DFEA4F077054ADDB2906B0B335EF45994144F7EAFCE7C3220EBC45B86316E72000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 173ffaf3-b3df-4338-9ef1-08da243f635b X-MS-TrafficTypeDiagnostic: AM6PR10MB2054: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: IOWgV460+aX9ulVk2dBvjgeWbTsoc26qz2AVNy283gSJ4mHVeHzp4z91MYUfvkZWX8K0NbDkHPij6Tye0PBwIqrn32GMA7BrsToaKHlS8ADpl7EBmf3QiGlbmKGe6MGUDnqGRk1Yv+tpjviz7b5Z0rSPA3Am+A+t94aJp2Zwyo11qAr5yX0WU8hpJJbZ8HiybqG+7uKtMUUn/Hnprnxw2OZkTj54r2tW2KSBrEVlKIH8inKGBBKieKtepTSiYW9uW+xqWpyt1snCj2oGDMlSnk2Mrsa5sNkxYlSjIZmGlXyozMU0ysH/AXcw/iDSVhLqH49QZVdRoiFCPofb+HApXSnj2RNH60NHNMXBTH2t8veVxPBhD+5g8DHpF8M2Q8pW/5gPyaU9/MCVlat2RGjOOuhcZOmFR+jYJdr7/dFfPAiAEE6miDjYglMrk8Wly1b/7+EeLKyqyjaWp2ABnZgN2CqK1iSp+cF+MpjzeFe5Uj9WUiPmd9GvKJDtu1GLzCpt30ZJILN3ORfJV1sQUaDDqslIFjehU9OhUMdBT4escxjvos9MwnsuOTjK+wOAgAcoQdUCrrddqluzJoDEpkkV/uwmCK5YiW8kzB+DMUcngUihFCcorLAXu7TgRtMZ++ggTPx5ouYKjMPk1b9J97KPuAXj03OfLUkgHyuV1YRpkjxIIuMLbe9o74j12zpmV8pluUgzsTZkUsk6Q7kL5Wc+69UwHc8UOOZ2ufEsvPO8Kl+yF4E/drd8Gtdm9APjuWNxzAUf0aT8/rLx8Mn0O/DWRDCMlF7jg6BG8h0rriTtiyu5VRrlIsOSOlVZz6gsgRPXPsyTObD+lDyluD9zws5wIqo7eIJ28szesJjBw45W1Do= X-Forefront-Antispam-Report: CIP:194.138.21.72;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(40470700004)(36840700001)(46966006)(508600001)(31696002)(316002)(86362001)(6706004)(5660300002)(110136005)(54906003)(36860700001)(81166007)(966005)(356005)(8936002)(44832011)(2616005)(2906002)(16526019)(4326008)(956004)(47076005)(186003)(16576012)(336012)(107886003)(70586007)(70206006)(53546011)(82960400001)(26005)(31686004)(8676002)(40460700003)(82310400005)(36756003)(83380400001)(3940600001)(36900700001)(43740500002);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2022 09:06:29.4036 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 173ffaf3-b3df-4338-9ef1-08da243f635b X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.72];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT107.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR10MB2054 X-TUID: +rhKGJ7s5tyY On 22.04.22 09:57, Henning Schild wrote: > 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. systemd-growfs. Only this would be relevant for adding more fs types like here. repart has nothing to do with that. Jan > > 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 > -- Siemens AG, Technology Competence Center Embedded Linux