From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7114631008580796416 X-Received: by 2002:ac2:5ec9:0:b0:481:16ae:5a55 with SMTP id d9-20020ac25ec9000000b0048116ae5a55mr6040786lfq.678.1656597344978; Thu, 30 Jun 2022 06:55:44 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:238e:b0:481:2fa:2826 with SMTP id c14-20020a056512238e00b0048102fa2826ls151958lfv.0.gmail; Thu, 30 Jun 2022 06:55:43 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sPuGfGhV1VwWIU2gR8w7bH0jC9cU/DBcVbHXKEYafnIBskLc8Kj7pky/JY3CeIcHHZ+xz8 X-Received: by 2002:a05:6512:261f:b0:480:fd2b:23c8 with SMTP id bt31-20020a056512261f00b00480fd2b23c8mr5939697lfb.434.1656597343900; Thu, 30 Jun 2022 06:55:43 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1656597343; cv=pass; d=google.com; s=arc-20160816; b=FggRp5HnAlJ6Zhu8CfqUtpOJEwLdspLlc8iSghKgQpbvbyyYaxuF9e1sFvtG/DRhKD VF+8WP9c5aYnvlYGabPixIdoeT/txk5c+iawTFZIHC4WisOr8es/XdMLrnJEQaPsDjKz NY2Di544qOnisVPHG0oTOw8d3qgOiTn9Qdt7OoldzmVwV/0MOEKhV1MFE8bTZGxlemvl XKNW1Ah9glWZzXwhGtr8pKkkphrVyAOB6bg7kiipzRJsTB4UrojACRhm3g0S6iQwda1U cGvNlX1e7pEPBdd4KvE4IpBrDx32rRe4XS2zG769CTnc/nupyG2SgtE4dX5o936fdcX0 u75A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=anizStDCA7VEllZz7UUScmP9CSrF+dD3LtJWRPgVB64=; b=BtnJh8dc2baCJ+2oKteKtTn/PkToNHahoLg2EvMzDGUdLVSm9Ui76K3WfKBF+VhY9W jGqD8F/qH6Dlgi+DGEK8EC5P+0Dd+lIt2yiQKgnFIwNSOwwdgqVNdYi1NQ50T25ca+mV onF6LYa/zK4IlU4mOBxiP+c8NMVuD9S3QZHMvhloKkv7urM/Eo63G/SBbLtR30CMkBf0 SCzOzwDUbVydT9wdzAtuEPuHkRyvhLaOU3qP8V4M9Oqk6mB1ziOHfiu7r30yzyBj7/z9 qlgeAg/SA64ANF5iSibLVC4Kb+qFG6fHzf3e5vlPJU/FHnKlviMhEMJsuMifsX3RlQ8V /s5Q== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=mjdpMjDB; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of tobiasschmidl@siemens.com designates 40.107.2.67 as permitted sender) smtp.mailfrom=tobiasschmidl@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20067.outbound.protection.outlook.com. [40.107.2.67]) by gmr-mx.google.com with ESMTPS id k10-20020ac24f0a000000b0047ad98bddbasi1010506lfr.0.2022.06.30.06.55.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Jun 2022 06:55:43 -0700 (PDT) Received-SPF: pass (google.com: domain of tobiasschmidl@siemens.com designates 40.107.2.67 as permitted sender) client-ip=40.107.2.67; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=mjdpMjDB; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of tobiasschmidl@siemens.com designates 40.107.2.67 as permitted sender) smtp.mailfrom=tobiasschmidl@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=mdL0TkXSVO2n7Popf4kr+mpJ2S48G7vro/1dFnhfvKaOxZqFZiuB639x+yJMbSqSKTecHTOi/QCseAK9snS4Mp7O057zCBM4FYf5Dg2rfcKxOf3gIv3fA3MZ12RUDrP3V5PS5zxPgG7lUwV5ZwXXEZ52d9jeMf7TQqNTJ99KkKCqJ3sk6aSNjRZHILdgdVUANo9K8Ip5305lj9MxIGrC182JlBz5g2fj/z5FpnMOKgoyiJxF9GeuxwQ/qm2f79673Hfl2xxnFMDyRAWnZrlTrBCqImZ5E6FJRkzPge6jloqoyo7vrVhqd5Q2MGWsS0Yrcpd8jgqlEQqEVc0mIRdOIQ== 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=anizStDCA7VEllZz7UUScmP9CSrF+dD3LtJWRPgVB64=; b=IxI3SSBEjasVOuAufb4tef1gND2O28la1FuCb+Fnpr+nLrZ2vNK6h+0RhjrrRjrKBGv3aic2EUjznsVuy3vv9ckK845+RWpNFbPwMd5sElu1t06Au3F8UdBrOaN1kaGNJbQMDvuGKxtdSja5d7vYqrpqtbcZhKBHJc5WhJ1EQcBhwqVWzUhljKw5rxvcgznNfzKW7EdJn2MHq7yrBtXRZVB+CIYOlRGwW+PwDrjbsWozoY1hvzC5fjuPkm0CcydNB50iId3GqrYT8pZExkpZ8Ke8VpC6tsE+BsLolUdYWIFDkdht1tLtldv/gTxqoovLR2i2zYG8PFn0Df35Mamwxg== 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=anizStDCA7VEllZz7UUScmP9CSrF+dD3LtJWRPgVB64=; b=mjdpMjDB2VAEYFR/c9QoptwKiqi5YhDBVbx3m/0FXkDyxNMuwsToe7Chhlajqs/cu7auFJqWevX4DP+ZPhppZn6jSILELp2JoXPZSRyJaN16FdpQhLh2sgqRlznQ7nosMInwhnqLsavsZKIkYhq+0r9I8PdmogRnw5V30Ux5AFiNMxtepYwFOOIemhzUDkeP9QB4qsdhGK3TtVdFS3cPlRxWDAvYuUIsJjJpdWJE832rhRhXOFc/RwgVnUj2PLVAjEV0/79JQgk+HVyNgYX9QVF28tJf8Zz2XFQfe9cWrdKDmikPpYOcjvfIQ+XSVWDtGdmI3vU6MLulB4fcTfZIlA== Received: from DB6PR07CA0169.eurprd07.prod.outlook.com (2603:10a6:6:43::23) by GV2PR10MB6115.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:7e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.17; Thu, 30 Jun 2022 13:55:42 +0000 Received: from DB5EUR01FT096.eop-EUR01.prod.protection.outlook.com (2603:10a6:6:43:cafe::ad) by DB6PR07CA0169.outlook.office365.com (2603:10a6:6:43::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.6 via Frontend Transport; Thu, 30 Jun 2022 13:55:41 +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 DB5EUR01FT096.mail.protection.outlook.com (10.152.5.170) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.14 via Frontend Transport; Thu, 30 Jun 2022 13:55:41 +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_256_GCM_SHA384) id 15.1.2507.9; Thu, 30 Jun 2022 15:55:41 +0200 Received: from md3krqnc.ad001.siemens.net (139.21.18.132) 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; Thu, 30 Jun 2022 15:55:41 +0200 From: Tobias Schmidl To: CC: Joe MacDonald , Tobias Schmidl Subject: [PATCH v5 1/1] expand-on-first-boot: Switch from resize2fs to systemd-growfs Date: Thu, 30 Jun 2022 15:55:31 +0200 Message-ID: <20220630135531.717696-2-tobiasschmidl@siemens.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220630135531.717696-1-tobiasschmidl@siemens.com> References: <20220630135531.717696-1-tobiasschmidl@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: tobiasschmidl@siemens.com X-Originating-IP: [139.21.18.132] 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--12.788400-8.000000 X-TMASE-MatchedRID: dFs3TOnCcpISoMXQbDenYUXpV/9Io3LGB81uozkhVupbUzvsaHW6BqCu yp8pw7JKgU38wRbnPPIS5LnfGo4vrXUNjnbmgqQ0QG62Sn3aGkztWteqKqfAdQi0LLplf+Uv69x ONVZSrH1sM0gH0rnSZqP7P89oupYwdDtyrAUAFQNT0gFhwwXJ3RC0quJvMyl3kbMiEOIxZeuc4S 9ubwU6WWwddpjY2s7XZlj9F1etQo0/VesZiTx/be2tO+jjSgd+ItIDYHDn0baEv01fZOqaQJbfX HbtT1BiFujNgNeS9UDGFy1Md/zCc30tCKdnhB589yM15V5aWpj6C0ePs7A07YFInLyeDAoZKItk nqMAus/LH5uGm6EscMHzmls6wGa16uxAa8kvHo21AMzNONEyEA== X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--12.788400-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: AB34FA5EC2743AA57BFCE8FC3FA519BFBDE4BB1E3B2E7E9A6D4A323D99CA75202000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 82e5a03d-d608-45fc-90c3-08da5aa038b7 X-MS-TrafficTypeDiagnostic: GV2PR10MB6115:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8h52sJNnmWOrrABetU9oUyE1aJsIQMCIW9sRDCzhRxfzWmPtVUviyF5prnJhgGX1d+n7TVq35RVsjVbRQGvQtwT/vRPsT3Gtu6wVCXtUYIZO6BhGNfWq2sf30qlr6SFwjbXx8h8K1Njkq2Mt29aH6LZYoDtllsU0Z8SN0Ii9P2u4UuMYn2lkbRPsuBfHsmMMu+o8OTV7wPvOq2DKU2GGP1hSnPhlBHgd2h+NlGOhoI1zJbv9nn2vP7qWDzJREx7P2u5P8gFA5U5OvLc88oCJSWKqMSjfJ0GiH8eYXRBLQIiVs4xPlIrB2JSnol86SKcEfmvfUZU2nZ9gTSWEcd0JX+6MCUAcSdZPyB/Jvi+gC8xi7liI1EoOtOxYWSjh4PNHBqmjGh0BodSMrGABs/TRDw1zPqwUYAlRWmR9ll77qC6Ctn0C5ZuOsoAZ8Pp1l5M9J0/m2BQ8r/STXc5QZ3F/NJ6WPsAKImEsRoa7+Rk//17YsTHiBHpyOjwcSP8ePDevpIAAFarisqCyG+ekdE32psMkv/os+Ae4rpMjp8fOWjNcqBSE5c+jz8gDc6BjsBuFuEYwk/3p5m5E7ecWAUCPcPSHutbVotPilvvwQi0GyIU53zJY9ourDWvp3uQGLYkItC1WgxkOZ3hxSUvAGbkm3uddhEOjsuLViUnNfDU/J6P4ounTSdAX3Od+B3zJiBnGAu7/B4XACh0LPgbERV/RjlFq5FCbcqvvb/Y0leFU9AGlnyzk5PSo6yAvrQ2+OVIT/hCvsqCYmXzF5rrNlBlG2ZhlVXlrTpN0zFYYWdcbbxl0Ty6tdhtfNz3eoKDgLNZQvUaLIn+m8xCc3YTy0gGAaVkzBohq3DrkswcjCH1IKN0= 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:(13230016)(4636009)(346002)(396003)(376002)(39860400002)(136003)(36840700001)(40470700004)(46966006)(82310400005)(54906003)(36756003)(2616005)(316002)(956004)(107886003)(478600001)(1076003)(86362001)(6666004)(2906002)(82740400003)(41300700001)(47076005)(6916009)(5660300002)(186003)(4326008)(83380400001)(36860700001)(8676002)(16526019)(40480700001)(40460700003)(81166007)(8936002)(26005)(70206006)(356005)(82960400001)(336012)(70586007)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2022 13:55:41.8386 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 82e5a03d-d608-45fc-90c3-08da5aa038b7 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: DB5EUR01FT096.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR10MB6115 X-TUID: aa0LsB6AvShL 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 | 19 +++++++++++++++++-- 2 files changed, 20 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..31f1ae3 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,19 @@ 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 $LAST_PART out of tree, so we won't conflict with other mounts +MOUNT_POINT=$(mktemp -d -p /mnt "$(basename "$0").XXXXXXXXXX") +if [ ! -d "${MOUNT_POINT}" ]; then + echo "Cannot create temporary mount point ${MOUNT_POINT}." >&2 + exit 1 +fi + +mount "${LAST_PART}" "${MOUNT_POINT}" +/lib/systemd/systemd-growfs "${MOUNT_POINT}" +umount "${MOUNT_POINT}" +rmdir "${MOUNT_POINT}" -- 2.36.1