From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7101651034648346624 X-Received: by 2002:adf:f183:0:b0:20d:a92:f244 with SMTP id h3-20020adff183000000b0020d0a92f244mr27263872wro.431.1653482852019; Wed, 25 May 2022 05:47:32 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1c1b:b0:397:70f8:bd74 with SMTP id j27-20020a05600c1c1b00b0039770f8bd74ls624189wms.1.canary-gmail; Wed, 25 May 2022 05:47:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwRPSYTPyZQRV4wmPaqT5jxtNtegumDFp1HKeuu+T5tSXDIhkf/n/MpqtAeHDkHsdToUYH4 X-Received: by 2002:a1c:44c3:0:b0:397:3fb8:664b with SMTP id r186-20020a1c44c3000000b003973fb8664bmr8119361wma.163.1653482850851; Wed, 25 May 2022 05:47:30 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1653482850; cv=pass; d=google.com; s=arc-20160816; b=PXYsib1dRVATEsqqnQ/S06GVTgpE+so4AMSkW+43wi5lij/mxgnARFRw090rAIR+71 4LRIrTeQynevbv4tBWIH2RlscVUQqWMb/92JW7xO5ItGtFdlrq1P7l8SK8Xo8JbsmgMc PNTXskli6zl7Q9ewMo++YJsFB8M4cU0Uq+cWycs3yMZVYNC0071NFJtVCxDDhFMGGQwI 1DH+a9p6dJZp3iPmx8TNyFGaBDtB513yD6WZ7/CGcBhIOnlpZC7VLpF9hvkZh+wdzJae xdsv6DTYWJLwSh31J+XBup1yRSlwo30zG7yp0DAbTwmzm/b+clII8p9ZJwZbVozJM9V1 saGw== 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=M+zTkyQH3gMHiXcH0Z19X+ybK7MhM+nuv/r989Srn50=; b=F5PWHVKTRW6clXbs1exJRChIdudrCLYKQr1//+cHecvSX0d4K1Ne3dp6kCfXN8IISi DIf/zSPxq97EfGBtHlAT0uIq6gIFHsiFka0j57gFm0r8DMyM9zHCz8KRpVa/BQ1gr9LV aecuVLpbttrt+aj7YoYCRhI6EGC+vJrmvKu51X9pQgjW1pRz0AbwU+JuSQVfDLPSIII7 5wy4v2wnjRz0+p6YBH56vXadtTE7oWqOLMQdUmToP0ah12SdIy+cX4jNeV+RZYh/8fhS rTYLd9FKsSKSWv9BMuplr5gP/tFL9p2CSCJ7JFZyGekaPc3kANraKTumfuItHuKswppV zKuA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="f/VAJXtQ"; 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:fe05::631 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 EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02on0631.outbound.protection.outlook.com. [2a01:111:f400:fe05::631]) by gmr-mx.google.com with ESMTPS id c6-20020a05600c0a4600b003942a493261si349647wmq.1.2022.05.25.05.47.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 May 2022 05:47:30 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe05::631 as permitted sender) client-ip=2a01:111:f400:fe05::631; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="f/VAJXtQ"; 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:fe05::631 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=GLJlJGazpIS7cuNJnHqcWpeB77VtVo+A7lOAJ7xEC3nKGc+wSalgrysuWDrFLcdRRJVAmZdErcOCk9TM+jJ6a/5HZCBYedMhZTHFsWZk0xvmYEeuC2LAyp9tpMqRZVKxH7wuot664YtHLYBPnWF2dQoQ73pdnGGbuGz3/mbDCN27sFxmKDmJhFASsMKNj5bs6tGpcsoRylHEypF7ZJGHJQK4cy/HZshBoJfoFu1dsmgEZyD81vJ5t63SMcnf/vxOk2F3jzmam4rBNzBB+yIrR9bDNweMs1aSMFYIwmYyUljmLerGH/hDvNjEkf4aPZqiWcSiHAeT2Tv2SAjc/okvPA== 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=M+zTkyQH3gMHiXcH0Z19X+ybK7MhM+nuv/r989Srn50=; b=G+yads94J5qlGJJbbxIzSJXpMBNjdSDouCLavjq7fFOXJXRssebexoztzKARYCRzRTivRj4l1cN7ZwN1wdjdHl/JkXPMDa3Xb+uzPTt9uapNF/zh1BSqEHYNixSavFZtTstLNjqMzRbPHGRq/vgqBeArDe3VJtSwby787EtFXnFX3qBmlzoxKJ4nR84PpNcNvCJJOlAgPmdYEIgJAkRTN2igWGpOpmrN/1aNsg2E23IyNcRYa1t350gqFizUwtG6GphMlgLp57nrEQJQ2/AtzG6witw0JPmYlc4Yu4Jn+EBh1am5+FPw8/Dm4Ddtl6yXMO6imffkh2dJct/RUtMifA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.73) smtp.rcpttodomain=googlegroups.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=M+zTkyQH3gMHiXcH0Z19X+ybK7MhM+nuv/r989Srn50=; b=f/VAJXtQhSF5Hg8Nn+9vB+AbfQ2v7cs0Dq2yy0JWP9F3nXHXC7Ybn6KX0NatyS48bcFHWTu97AIKHiuOI/5znmX55nSxLTOWxO0Ep3dhLUqflcNllXib07O08INIssUUzFPrqkhmfpF9H7Z25mXIURpdkn83qv/yw4ByLqcvFyzXJ2BmB8Ht3pJxJgOZyEfShd0FzUTV0z+pFNRwya2ceBxtwwuB++ju1KDRjNClYbWaDpBOuULw9Ran594Y0Sw64Bt6bgmXAjEOilmUdhdSpKtE7OJJlnr+RkkxB/4/Vf6RftpVLVrca6wHBYH8uozskLQ2J2SQ2R0SZHqiL4U/aQ== Received: from AS9PR06CA0330.eurprd06.prod.outlook.com (2603:10a6:20b:45b::9) by AS8PR10MB4646.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:337::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.15; Wed, 25 May 2022 12:47:29 +0000 Received: from VE1EUR01FT034.eop-EUR01.prod.protection.outlook.com (2603:10a6:20b:45b:cafe::e1) by AS9PR06CA0330.outlook.office365.com (2603:10a6:20b:45b::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.13 via Frontend Transport; Wed, 25 May 2022 12:47:29 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.73) 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.73 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.73; helo=hybrid.siemens.com; pr=C Received: from hybrid.siemens.com (194.138.21.73) by VE1EUR01FT034.mail.protection.outlook.com (10.152.2.235) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5293.13 via Frontend Transport; Wed, 25 May 2022 12:47:29 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) by DEMCHDC9SNA.ad011.siemens.net (194.138.21.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.9; Wed, 25 May 2022 14:47:29 +0200 Received: from [139.25.68.37] (139.25.68.37) by DEMCHDC89XA.ad011.siemens.net (139.25.226.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.24; Wed, 25 May 2022 14:47:28 +0200 Message-ID: Date: Wed, 25 May 2022 14:47:28 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 Subject: Re: [PATCH] expand-on-first-boot: Switch from resize2fs to systemd-growfs Content-Language: en-US To: Tobias Schmidl , CC: Joe MacDonald References: <20220525123246.779227-1-tobiasschmidl@siemens.com> From: Jan Kiszka In-Reply-To: <20220525123246.779227-1-tobiasschmidl@siemens.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-Path: jan.kiszka@siemens.com X-Originating-IP: [139.25.68.37] X-ClientProxiedBy: DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) 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--15.481500-8.000000 X-TMASE-MatchedRID: Cc2Ao8tLfKA5QaOxwNGfvo9bHfxDWoibuIdkeGnzAEkRyVsAxhhjrFWt 71aOqpDDt5bYHTs7Q/AUiHfUmS+ulg7hC3jwHcrdUs6V7+XpKLQexiL4/gRNNczSKGx9g8xhXHl QSIX8DvX5L8Bg16S75DnL1F00FJQUGWtzbrhLRggr1Onk/u2f/iS9O7aymfstx64UvlSkg3Hr3E 41VlKsfWwzSAfSudJmo/s/z2i6ljB0O3KsBQAVA3jDLQoheHObHaV/CAeQCvAmEURBmKrZlEYj0 zDHPzJpFujNgNeS9UAWahWL740rrivn27+DO/kwtTOrxEGQm4Zw1ghGV72CB54CIKY/Hg3AtOt1 ofVlaoLUHQeTVDUrItRnEQCUU+jzjoczmuoPCq3HzeNYWBaM9TXziuYwMSbdP16ZLjizPrEuY2L 9JpzcQYhLE0Ns6hs0 X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--15.481500-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: D9CA51636B94F09A30A359C26612BC75F9BF326684969AFA1CA183683DB5F2B72000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 82a39aab-40ae-46cf-d959-08da3e4cba88 X-MS-TrafficTypeDiagnostic: AS8PR10MB4646:EE_ 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: jqTiiOJU8Rf7q5Qtps4Xs7qyOh3e6zICwJdS8M3gOxn9caw1YmNwiQDoWYTsKdoEN2mriNuqzvkojFH07WHIDXmlVOeLdgYMXkDca5pz9W3gGIu+vUySZMreab1bMIrRXCkj5+nxpCipX1MbhhOV1gGkeVAMMoAmlwYljIA/t03+m45hihmvqQQVKljBK7IszBGjqgZp/i82H2P2++GI91/AhorpLNp34ifnjHRelRPqvJrK/YtrVyhYCIfLUOTPVLx0mx7GSrQka+ybG4jGQsCA1gmW30WochVXvT1yqffd2wk0M+h1D93IzidNhJvL5X8dSixq81PmMRjulhHMRyIwPUH2dVshJUfE9jdG13tPxeUTBLp9wBti2lLHq9BErHXkUiImjtJYUUxPHLPMqY5JyIqz9bGkcsxD4OXlYOgo3htpzKmoPqnn4VDM+IqCU1jjhaUzTR02Nkd7bhayFX4QOBCBY+JmOngzXCELHwsWlhZ7OJAofA/V0B7sDAD6EO9TcwMTVfu3MF98Oj+5s2RrBKRtXVinXb3p+Ipfy1shUi3QBY3nKmRFqcvIEutdGF3cDPkRmvHaetILepdfd45EUot62z74w5t5kMKPGk7Lqb7UBl6CIfi3q2Uz7KQCuCvarKJuzEbDu1ONI3F8E5kvZmXFwPpjA2Wrporr0onUWz/RZ+rWIKGHqy8D/qDx1+Mhg9f9QEEMf9ODXwmtzsTIpyNHi0llShfe8b2ewDNnEyEkvDs/UnfX8aad956K5RcPOpRtmPEtb0EUnfnU4A== X-Forefront-Antispam-Report: CIP:194.138.21.73;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(46966006)(36840700001)(40470700004)(82960400001)(70586007)(31686004)(107886003)(2616005)(83380400001)(2906002)(26005)(70206006)(356005)(81166007)(336012)(47076005)(956004)(82310400005)(8676002)(53546011)(4326008)(5660300002)(8936002)(86362001)(31696002)(508600001)(186003)(44832011)(36860700001)(36756003)(316002)(16576012)(6706004)(110136005)(40460700003)(16526019)(3940600001)(36900700001)(43740500002);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2022 12:47:29.3845 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 82a39aab-40ae-46cf-d959-08da3e4cba88 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.73];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT034.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR10MB4646 X-TUID: INtPEcgbqyOs On 25.05.22 14:32, Tobias Schmidl wrote: > We want to be more versatile in our approach of resizing the root > partition. Therefore we switch from resize2fs to systemd-growfs (on > systems with systemd-growfs). Just for the sake of completeness: Since which Debian version is this the case? I assume buster is fine, right? But stretch was not. > > This allows for ext4, btrfs, xfs, and dm-crypt partitions to be resized. > > Signed-off-by: Tobias Schmidl > --- > .../files/expand-last-partition.sh | 15 +++++++++++++-- > 1 file changed, 13 insertions(+), 2 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 bb371e9..f0dc66d 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 > > @@ -45,4 +45,15 @@ partx -u "${LAST_PART}" > # when using systemd mount units. > export EXT2FS_NO_MTAB_OK=1 > > -resize2fs "${LAST_PART}" > +# If we are on a systemd system, we call systemd-growfs, otherwise resize2fs > +if [ -x /lib/systemd/systemd-growfs ]; then > + MOUNT_POINT=$(findmnt "${LAST_PART}" -o target -n) > + if [ -z "$MOUNT_POINT" ]; then > + echo "Cannot find mount point for ${LAST_PART}" > + exit 1 > + fi > + mount "${MOUNT_POINT}" || true > + /lib/systemd/systemd-growfs "${MOUNT_POINT}" > +else > + resize2fs "${LAST_PART}" > +fi I wonder if / how long we should keep the two paths... Jan -- Siemens AG, Technology Competence Center Embedded Linux