From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7114631008580796416 X-Received: by 2002:a05:6402:50d2:b0:435:8c44:8715 with SMTP id h18-20020a05640250d200b004358c448715mr3877239edb.49.1656504814644; Wed, 29 Jun 2022 05:13:34 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:4245:b0:435:dc4b:1bad with SMTP id g5-20020a056402424500b00435dc4b1badls102330edb.1.gmail; Wed, 29 Jun 2022 05:13:33 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sEpSla4ILWPZslSXXnrxXhsvXbCwlFvitklUFaOENIoIOPJqXJ8VKLr+umxcymaOVlMGZj X-Received: by 2002:a05:6402:4385:b0:435:9104:955b with SMTP id o5-20020a056402438500b004359104955bmr3800590edc.45.1656504813235; Wed, 29 Jun 2022 05:13:33 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1656504813; cv=pass; d=google.com; s=arc-20160816; b=VEhiPVY0IEUY1KeCG1CJiePqX1BW0FwdKEM6RPU/LgGR8VmC0ex+6ze/u3wqhxwQub 71wLn/cDMqX5q87ETXHZEUQHhVv0tGaDAupCEAkvQaOOC6FBj/eOe/TC+ZF40fJ8XMvM 374fvFwLxv3H+EmwSRJeUTwkOkCkjykXeCI7RlR/zBiF5any3Wp/ez2tCKwRWLCrvN7W V8vp321t9kGFMHR107spk8MsEDbcaqVEyeVBjUFuedgIApkAWfgaYDWfwilZK035mMCp fkIRN+Q0G2m6dm+jEUWCxB4pALt3ccqI36eTZOq0WTVGidLAruICcJK6Yabe/Ym0enj5 a4zQ== 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=DmNU2hcdBKDS7BlIzUSTKHU/KS3qgh27qH9zqcR7tUA=; b=mDv+RHGpKTAoiiYHrxk6dqe2L90/rXBg4qnPYjAuTDeiyKPfCfnHWBjFFni9xb4EsI 2av7SmKvSWw0kSpgV7jSIyxd9G/wxmxPMkhSVTvvcONelP2J0GNA26iVbFV+sh9/oNP7 OXQ9nVsj4mHc66GvuEtauy+WbNyacFx9TV4qwPggu5eQwxDxTzKnIYIvq/JY+H+JpncR SiWu5Pihm/Cfo/Fhr2daG8yQCOqi/CkL8X0FqCN0hUQdQbbbmdh6531FaJo8Rvp2ifhC ysqc4aNU6dJZaIFAlbIfQ62k3WAsuQ5rAIoZWN7OXl0FhoG+kS4ZVTGGj3J9+uFQ9XeV z4Mg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=XLvz596w; 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 40.107.15.48 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 EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150048.outbound.protection.outlook.com. [40.107.15.48]) by gmr-mx.google.com with ESMTPS id e24-20020a50fb98000000b00435a7649ad4si819388edq.5.2022.06.29.05.13.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Jun 2022 05:13:33 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 40.107.15.48 as permitted sender) client-ip=40.107.15.48; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=XLvz596w; 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 40.107.15.48 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=W9m2U60PE9fRtjzBLfUGXP0d0wrXcdFNCjKZ/R7BwOdH8NO54eeZZ2etAN9A7fhFYQSai9gihufISYni1mEg4whq/j4LLKy1YplMbmI6ZZEtsAG1qBbMow1YJ741boloz+vZqE8ip6LCLpPPjldMvfBvbxSXBxz+ujr0UGIuXCJZqJxxfLIH5HvtDBOvUFSCwbJfQdVP9Viv6ulkSou1D3a2YrPY0rmRBefChar+4IH9bcG5j1vW9GQOcEC2wMjgfEiKxhhu3MFxaXglYjgEjIsQYFV6PtixIi/8GOWUmZFElXqH68L77o0brHbYct+AYb+KCy23I65VzwDVjUOJ/Q== 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=DmNU2hcdBKDS7BlIzUSTKHU/KS3qgh27qH9zqcR7tUA=; b=UFZqIWb0evBquuAVkxUeaNsUMuAd/GdCS1Quf0M223cKSnc5FUPTDeExOXgzVt9x9Vs4I1h64gEOQvK0+3Rlsifm4eDWBN3jhkk7lhU0oAdPBAyH/sZk1p+h3DNbqncj/LmPQhuUztI+Wph0k0F/hHQYpXxhO1b5ou4pgDkSJysVyQjExGBXI4TV6ecwwIWGIGUPDH6c954Wyi318IWCmzYXFz4obEGazs4rmeVDMxl/1A46sxcZtZ+zkvwEjxYQwy4U8UTBnL2RBv+oQzCrQ5phqkM2ahhfhmUpM0woPM5mbmFMZkNt3aax+IbvfibjIZDG7U1cKA7NBpdmuYgEPg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.71) 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=DmNU2hcdBKDS7BlIzUSTKHU/KS3qgh27qH9zqcR7tUA=; b=XLvz596wQjNfoHHosCt1PqjVCiBWmBaz8X2KZQeMChoMmr8eKJqWuzAAp6NrbhZw4XGey3Snz5lm6ZZEMerSeV7UVfegVI+rNYXrDeiscthv9cfoH5cMjlIju20/GaBIy8dJRaDXW5V2QrOLu0zjpYKHqPRCgDSYpIf3heLK071EYgEtH5WlfRi1WqTCGAYdaGN4ez391sYmQyX23D6CXXG/Tv7jY5tab1J+nPsfwWEWJe2QknMU3q+Bimjk9jdF1RcRz+AUWr0LbePogpzd7LbeU5OaHzZxf9Zb2JJNLn3c/MHeB3uOWE25v5XhUmlW2JpvKgamg24w6+/lMwftqA== Received: from SV0P279CA0004.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:11::9) by VI1PR10MB3167.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:12d::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.14; Wed, 29 Jun 2022 12:13:31 +0000 Received: from HE1EUR01FT014.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:11:cafe::16) by SV0P279CA0004.outlook.office365.com (2603:10a6:f10:11::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.14 via Frontend Transport; Wed, 29 Jun 2022 12:13:31 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.71) 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.71 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.71; helo=hybrid.siemens.com; pr=C Received: from hybrid.siemens.com (194.138.21.71) by HE1EUR01FT014.mail.protection.outlook.com (10.152.0.156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.15 via Frontend Transport; Wed, 29 Jun 2022 12:13:30 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) by DEMCHDC9SKA.ad011.siemens.net (194.138.21.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.9; Wed, 29 Jun 2022 14:13:28 +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.2507.9; Wed, 29 Jun 2022 14:13:28 +0200 Message-ID: Date: Wed, 29 Jun 2022 14:13:27 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.10.0 Subject: Re: [PATCH v4 1/1] expand-on-first-boot: Switch from resize2fs to systemd-growfs Content-Language: en-US To: Tobias Schmidl , CC: Joe MacDonald References: <20220629120144.507398-1-tobiasschmidl@siemens.com> <20220629120144.507398-2-tobiasschmidl@siemens.com> From: Jan Kiszka In-Reply-To: <20220629120144.507398-2-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: 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--16.004300-8.000000 X-TMASE-MatchedRID: AQ9SOYvqpDY5QaOxwNGfvo9bHfxDWoibuIdkeGnzAEkRyVsAxhhjrNyA omAsZentkYldHqNEW7iJPiRk7PkoEyRDP7xDEXHWr+8P0TizLg0p1LzWJnT+MAPZZctd3P4BTXo 3QMP2198H8UzOewTxww13bv/YY/bO/TsFN/G8+UYflnEcV5G+HQsTH6q5zeP3cxMkBeI9K3cXjf R3d0weRhZWAJoAV0sMyO/ICE5Yq5QINSLYRig3BOmWxAgjfDfrHaV/CAeQCvAmEURBmKrZlKxT+ JfQDbCPvn1ivDdpAIcZ0+2buF3T0sPKrOStI7TQ6DRCFb9fK7aV76rqTtD9zC/MuWzsdN8ZfS0I p2eEHny+qryzYw2E8LLn+0Vm71Lcq7rFUcuGp/EgBwKKRHe+r1vLa8X4xzR5dQCkMXbjbyij7lr wIwA2sTj5hLX7khimxcp0sdtM6DY= X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--16.004300-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: 70995321A7E60C3EECF711090CC096A48F476D99ABC6ECC7547763E422FBF15F2000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4ce3ed19-a768-4c55-4558-08da59c8c7fc X-MS-TrafficTypeDiagnostic: VI1PR10MB3167:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Xkpvc0ROmNTmK0MwWfhfVtVoJCpJcIAwFXX9sRubcqzUNkuvQo5hO40dtDB+vhrxEDWsyvOcvM95FfQKStUkq487+/W+8Z18acBl3P+YxLQbvx8ouq59LS4qm4BSLbj/uXuU76k0cFs6kDeD0UNwQqs+Mhzt9TQAr00evRiOUZAzVKz1AX18D3rOu6IQQ9MNyD5L7jAhRwnjiFELWUKaggRUYt0aMNVixwQx1Cv4gk2mgomFBzEs6ZKIV6HRRL4dqB+rbLn0BB1sSyCBGosJ00eHZk712utH1YmeoBag94Xbyrpt+jlhPFlhpnfH1sl6SeEmpkvlxHUn1xN7LPxulrauN6jpuvf6+p/AQOO9an9d2UC6pYuEAXoS4sJqRNu8tWuDPepLy/blqLyMnEDry9y4/Vx5fDiooGaJRJbR2BlMckBaKjpw5GudLri5vTmvrzHVUEVCDQMMkN3CGNtDSyp/IHZArf7tdUsYbUgq3R+usyb3uyBLpTA/XglgkXseWilz8u0a9cCviY2HvHc//a7DYV2PoJyB+cK+kK+9orq0UPvhomDudazyDon/jBocKMGVuh++ejr88Y7YA8VkJKpLYhQZstQycXi9BFZ1O80JmXNoquELdcyH/4gj//Z6rae1ndzzmslXPajth8vHgc7iOuGycRnRGSAiotOAl1Fz/2mS6Klo1ghPNg4TgHLTEt/ooBIN9367uBh9UD+/dCZxq9MBURvmgXj+ZBOtue9B5gR06PlzuG2HOMjpyKd3rTI8KJj2i/LPIUdIefU0ErNdLZYTP0/PhtoypvzTebDFZxV4/vLkkO2bbr1HPQyV24QOeb1Dj1vpMGUpvFGlmDotmZKljr5ELBtyiMKDWj6hBHDlhh8LHyzn220KscHpdcGfc97nhMTDL0D2C8lzJg== X-Forefront-Antispam-Report: CIP:194.138.21.71;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230016)(4636009)(136003)(39860400002)(396003)(346002)(376002)(36840700001)(40470700004)(46966006)(53546011)(16526019)(186003)(336012)(5660300002)(44832011)(26005)(110136005)(2616005)(956004)(47076005)(107886003)(6706004)(16576012)(316002)(4326008)(31686004)(41300700001)(8676002)(70586007)(70206006)(2906002)(8936002)(81166007)(82310400005)(40480700001)(83380400001)(36860700001)(478600001)(36756003)(356005)(40460700003)(82960400001)(82740400003)(86362001)(31696002)(3940600001)(36900700001)(43740500002);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jun 2022 12:13:30.9095 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4ce3ed19-a768-4c55-4558-08da59c8c7fc 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.71];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT014.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB3167 X-TUID: pMX78udxDwy4 On 29.06.22 14:01, Tobias Schmidl wrote: > We want to be more versatile in our approach of resizing the last > partition. Therefore we switch from resize2fs to systemd-growfs. > > This allows for ext4, btrfs, xfs, and dm-crypt partitions to be resized. > > Since systemd-growfs landed in v236, this obsoletes expand-on-first-boot > on stretch (v232). > > Signed-off-by: Tobias Schmidl > --- > ...oot_1.1.bb => expand-on-first-boot_1.2.bb} | 5 +++-- > .../files/expand-last-partition.sh | 21 +++++++++++++++++-- > 2 files changed, 22 insertions(+), 4 deletions(-) > rename meta/recipes-support/expand-on-first-boot/{expand-on-first-boot_1.1.bb => expand-on-first-boot_1.2.bb} (78%) > > diff --git a/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.1.bb b/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.2.bb > similarity index 78% > rename from meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.1.bb > rename to meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.2.bb > index 1703a64..48d30d3 100644 > --- a/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.1.bb > +++ b/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.2.bb > @@ -1,15 +1,16 @@ > # Resize last partition to full medium size on fist boot > # > # This software is a part of ISAR. > -# Copyright (c) Siemens AG, 2018 > +# Copyright (c) Siemens AG, 2018-2022 > # > # SPDX-License-Identifier: MIT > > inherit dpkg-raw > > DESCRIPTION = "This service grows the last partition to the full medium during first boot" > +MAINTAINER = "isar-users " > > -DEBIAN_DEPENDS = "systemd, sed, grep, coreutils, mount, e2fsprogs, fdisk, util-linux" > +DEBIAN_DEPENDS = "systemd (>=236), sed, grep, coreutils, mount, fdisk, util-linux" > > SRC_URI = " \ > file://expand-on-first-boot.service \ > 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 c0edde7..1743890 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,21 @@ partx -u "${LAST_PART}" > # when using systemd mount units. > export EXT2FS_NO_MTAB_OK=1 > > -resize2fs "${LAST_PART}" > +if grep -q x-systemd.growfs /etc/fstab; then > + echo "Found x-systemd.growfs option in /etc/fstab, won't call it explicitly." >&2 > + exit 0 > +fi > + > +MOUNT_POINT=$(findmnt -o target -n "${LAST_PART}") > +UNMOUNT_AFTERWORDS=0 afterwards ;) > +if [ -z "${MOUNT_POINT}" ]; then > + MOUNT_POINT=$(findmnt -o target -n --fstab "{$LAST_PART}") > + if [ -z "${MOUNT_POINT}" ]; then > + echo "Cannot find mount point for ${LAST_PART}" >&2 > + exit 1 > + else > + UNMOUNT_AFTERWORDS=1 > + fi > +fi > +/lib/systemd/systemd-growfs "${MOUNT_POINT}" > +[ $UNMOUNT_AFTERWORDS -eq 1 ] && umount "${MOUNT_POINT}" Explicit exit 0, or "if then"? Otherwise, the script may return with an error when the condition is false. Looks good to me otherwise. Jan -- Siemens AG, Technology Competence Center Embedded Linux