From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7114631008580796416 X-Received: by 2002:a05:651c:170e:b0:25a:6e96:c495 with SMTP id be14-20020a05651c170e00b0025a6e96c495mr1590106ljb.2.1656504117491; Wed, 29 Jun 2022 05:01:57 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3b0c:b0:47f:9907:2b50 with SMTP id f12-20020a0565123b0c00b0047f99072b50ls197819lfv.3.gmail; Wed, 29 Jun 2022 05:01:56 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vhiwknon889LssMbQfvSDTHopMlR4bXhAi0PjcVhSEhz0PLLpQhLtRw9kCQx+GA6I0VLwI X-Received: by 2002:a19:7b0a:0:b0:481:18b9:ae28 with SMTP id w10-20020a197b0a000000b0048118b9ae28mr1860262lfc.317.1656504116086; Wed, 29 Jun 2022 05:01:56 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1656504116; cv=pass; d=google.com; s=arc-20160816; b=xU95oAIXvrkzRnYzVIYD6RvzFWlSFV9DO9B+v74VsNhgQOhm8IVyoV8WjdYDYaQquv 8ZdXy3FEFmqUfNOzmalGkBndNtcWKpKZ3x9RetTPYHaRu5aLJB85bUeS7WeDIFJcpK0h ElXb+UWBnD87e7o+GAXQv2XvaY9tV3cOGOjjdxKzPLS4xnYpzHIcd07BzcHArPcrt1Cu sKx+maWV/ss+qJpEEvr/LBSHry/b94b+dCkXhWkkqhH5ssrR4X/DdnhPswXu/93XTQMK hdpPzx59dDDuWzhQyxbOT8pgKjBUbUepyy+XKNCxxS0iAIuWDVbQ2ta5dFbkDw/HcAH2 WFFA== 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=xF9EqYmEE+PWbdEFe5ljEtgjwiDoiaEVnF+Xiw8ORTU=; b=d3WPj2tMBWZrjeLzZdt3s7iP8kNa62L92Gvfqhj+3bU6aJ1A9WqJQ9B7E0bcv4jLJv jp3oWq/S0KSdZ0fJIlPJtGu5CezKUMck34r55xXeZvf3VGrT72v35h7y3BJ2LQ82M6hn SgHOXTR7OVE+UiHBNDAmI3KyKAF6hwGas2lp62NtaR56Zkd6MXydgxJ/+n93IYV1EQec 95A+ilaH1UbZE09nebNDJz23dw6/1mDrhM8gJnHxwgZkfAekcBQF0TLdp1zDToogISGd x2WYSzCGXfxHT6LtRsEbs2HQ92jT8uKU57zI+pLu68qf+rbuq8jK1jjlQX1iIHHE5/zQ nVxA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=dNH0HitR; 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.7.43 as permitted sender) smtp.mailfrom=tobiasschmidl@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70043.outbound.protection.outlook.com. [40.107.7.43]) by gmr-mx.google.com with ESMTPS id z14-20020a0565120c0e00b0047f750285c2si550813lfu.5.2022.06.29.05.01.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Jun 2022 05:01:56 -0700 (PDT) Received-SPF: pass (google.com: domain of tobiasschmidl@siemens.com designates 40.107.7.43 as permitted sender) client-ip=40.107.7.43; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=dNH0HitR; 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.7.43 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=kuifsaVWIITgM7/SxRX+xZw8eLKtfKXTQIpovfEoQ+GmZCgTLpJ5Zb05w7EL2KQIAPQL8JhORcwXmWDxH/O5CD1z80azuZAYraMYVeztj9hIb4gIZ2ZRnKL9+MBwo31LEB0Gmt8brXBn9gP0QK9rYNSAaJqkecgWx7S8GDUGP8k6ViVR5fFHr/bme8C3EmMw8jEy3xWLV2oECD6qxSA9+FUNf2dII1Vw0/BmjsET365fzTgwdoGGPVZCGIPw6TJo91dL2mhmfn/rOEhSZKac+8pH7JVwyJAny/WRvERXaJaXg3Cex4WjKV6BIN2rhmUPoFq980mIpOci/UdUR8tqFQ== 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=xF9EqYmEE+PWbdEFe5ljEtgjwiDoiaEVnF+Xiw8ORTU=; b=bsLgLe5QI7QudMSJY7/UAi5DKzuwqKrsSycpsZcRteIpNj0AmtftF65ngrq2ExjYL4ves76FZhkqb11d5xljM8+F/OjkYaaA0CB9tXxImF8PbEqw6P8+A+c4YRjt0QYaNArUXafCd+TmHzsYqNHMefQdi1aCsVRpOlOecgWBfz0n0z2xsbN4H72WoKp/qNejXChDrmYii/Ys5f+znrSMJg2LiLuSYzWN5VEOtOJKZ4ehvOUjupzi7hyKQCW4mKSjBtvK9MQ+KDvGub7F1Dr5Yqnh0wNW68Wt5bzZkmrlqD+f+dGNj6rI8iCPez33OSddm1vGaU1TdIax9p1Z3DcTvQ== 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=xF9EqYmEE+PWbdEFe5ljEtgjwiDoiaEVnF+Xiw8ORTU=; b=dNH0HitRFKUMLGv/bP3L7A2TovS7tkf4FwWWIJG/ztxKl+mWhdspho0Ii2n8Bh7Oqj5W6R+hOHJYS2Cf0/op7gYFmUdlcNcAC67t9YGFyeves/SgqSv0P2jUx+Qghe6yw6F2FHcf1LA03+qx2JaF2sQWlegFzMam9cXs/Ky/CpyY8gcohrBNcXTZffXDiRj6cDCaj1e//2+XUgZS/b4a1Od5CaX69ypRjRny3skbF/OBtwcLiGY5FjSSPzjHN5/brdnlrpJEPyIa0e3zLYIXBhdPP8SToj2PpxniLmaPLQKyQJpM4kHxOYNlhWenTthx7+OCPaMpDmDZ4RPjkyaJKQ== Received: from SV0P279CA0004.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:11::9) by AM6PR10MB2264.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:45::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.18; Wed, 29 Jun 2022 12:01:53 +0000 Received: from HE1EUR01FT023.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:11:cafe::be) 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:01:53 +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 HE1EUR01FT023.mail.protection.outlook.com (10.152.0.162) 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:01:53 +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; Wed, 29 Jun 2022 14:01:52 +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; Wed, 29 Jun 2022 14:01:52 +0200 From: Tobias Schmidl To: CC: Joe MacDonald , Tobias Schmidl Subject: [PATCH v4 1/1] expand-on-first-boot: Switch from resize2fs to systemd-growfs Date: Wed, 29 Jun 2022 14:01:44 +0200 Message-ID: <20220629120144.507398-2-tobiasschmidl@siemens.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220629120144.507398-1-tobiasschmidl@siemens.com> References: <20220629120144.507398-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--11.908500-8.000000 X-TMASE-MatchedRID: tP8kSK5Hl4ISoMXQbDenYUXpV/9Io3LGB81uozkhVupbUzvsaHW6BqCu yp8pw7JKgU38wRbnPPIS5LnfGo4vrXUNjnbmgqQ0QG62Sn3aGkztWteqKqfAdQi0LLplf+Uv69x ONVZSrH1sM0gH0rnSZqP7P89oupYwdDtyrAUAFQNT0gFhwwXJ3RC0quJvMyl3kbMiEOIxZeuc4S 9ubwU6WWwddpjY2s7XZlj9F1etQo0/VesZiTx/be2tO+jjSgd+ItIDYHDn0baEv01fZOqaQP0vp 4UXSHf0lwV2iaAfSWcURSScn+QSXt0H8LFZNFG73Yq8RVaZivXJL1P+t07A6Z0CDZlP817IOxHZ 7IEwnofY4pU9WX/PJGzRZkj8nARv X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--11.908500-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: CFD41A03D5FDD769ED88A94F7470CC8DCBD8CA7A2159D15F117D62611A31A0B52000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 556d515d-4d55-452e-9fbc-08da59c72806 X-MS-TrafficTypeDiagnostic: AM6PR10MB2264:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wDohLEuy1PZ+2y+xYgQdB0XlYx6uygskvMNiWKfdunJKWRLeJ/NADJuktDgfhi2c5wSB9OFoBM964AQ/QXa0HsK7pjkBPvm9vReCnfUf8s6BIgRKVWrFUZp+KqpacQVc36Va06fL2bWoSQh2DWqprHF+oTa/lqT4f3Mt49PiyBBpNEa15VtPlFccGg3na7jOdU+MTzanSry3yYBsnzaZtVI62TRgjEA2Obfdn61Zqul6+s8QeSiK04L7TVj4nORohNTfhvwgIIWbtdMMbu1ey5m3SIYu0Nwvc2hE9u66+/x/Ota/Yku93pq42mPuX4Lh2LfG8lzRufqqNJTOSL1c0+fxdFldJPUxKBjRSOztgQAffVl/vBZ9VL914zQkb8zcVb/dVtZdyQ87oKmGOazpJ97PReCTGgx7j4t0vmtY5GtPgH4YrFYgPqCsE6M9q6Uo1XiWHn3u+5PmhU7nWx6rrLRW19PvnTrJQnOa/vIXfazG2P0/6ww8WtWXuJ74Dsa/H/+0+2q9l9u1jRIawIn9Zr76XaspeydSP9VwNoqAjqQPav5128EZlj7Y8EqKQZfIdvkdkG4WTYHhDC3Ov0BJGJzyDh3+TuTYpzuCHwXrHzed/JavJqJRusuatF+dqTOCrxUHh9FP0YT7ALTmfCLAw0zVEStvUy0nFk20i+jy8xLxJLMkXyf9EH9kCdLLVP2gtpWF9YP5PyraRBFCaeuskpsx1wSoDWRswEoDFXQHOdaLO5mWA6VdBO82fQ9gsQkuNg9jl9aQGsDGkC15LHKNMZakymLJiVC4ox7MFJLUKtkXK4BRTYMyYonFQ/S568BiStaceusFl0UfU6EEyz5KbQ== 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)(376002)(39860400002)(396003)(136003)(346002)(46966006)(36840700001)(40470700004)(36860700001)(40480700001)(36756003)(86362001)(2616005)(6666004)(956004)(356005)(1076003)(478600001)(41300700001)(2906002)(70206006)(70586007)(336012)(107886003)(81166007)(4326008)(8676002)(47076005)(26005)(8936002)(5660300002)(6916009)(16526019)(82740400003)(316002)(186003)(54906003)(82310400005)(82960400001)(83380400001)(40460700003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jun 2022 12:01:53.0434 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 556d515d-4d55-452e-9fbc-08da59c72806 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: HE1EUR01FT023.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR10MB2264 X-TUID: b6UodMlL9Rqq 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 +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}" -- 2.36.1