From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7101651034648346624 X-Received: by 2002:a5d:514e:0:b0:20e:67a3:d451 with SMTP id u14-20020a5d514e000000b0020e67a3d451mr26311136wrt.350.1653481981159; Wed, 25 May 2022 05:33:01 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f346:0:b0:20e:7267:9ee4 with SMTP id e6-20020adff346000000b0020e72679ee4ls22252476wrp.2.gmail; Wed, 25 May 2022 05:33:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx0iVPcPTtGqOyyNWnWzznVAtXApbMQ2OiH1z+dJNpYD/EeJzIS5OO0zy3DL+gV2sL+1BmB X-Received: by 2002:adf:f24c:0:b0:20c:fe15:504c with SMTP id b12-20020adff24c000000b0020cfe15504cmr26857505wrp.123.1653481980146; Wed, 25 May 2022 05:33:00 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1653481980; cv=pass; d=google.com; s=arc-20160816; b=tF33nSXZ74QxeVKxfCGxBqRzUJCfDzQuR4gnBQKB5tv4BRdXYuAWWdMnFtSx8nrSjX glhtNyDToPZbi7XzNVa4nk1csNNYqdMBJftAp7JEQ2Az1PDW1UJ76I+frBvVNKLttBBg y1gyMTDrOPW+4u3zgp4yvinTPlt2nDP7YUvSpBWDj4NDTaKL+c9Lut2yr9Jx+NutVJxD jnOp2HadHj1zOYBzSoL/uSCrO0DT7h3Y0WkUaBKY/TuXvKy2WZw8/q1PvvvuM8iFEp9l Z4jpTTX5eWLP+w5Cxdqar+pGiHd7VfDOfVRQlZAHkxwbqTCg/pIRkDqvVLDKczrSG3uP 93Sw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=qBHDH+muA6AVc5CuaNYspaP/uN4fDLikj0IbGk2CIM4=; b=ihYZ+AJBVwNdqHwQ6j4dEOG7PiWHfhy+Kj7YTGc2l+CMdWD8Te8E/nIeuoDxnLi/X7 U/5P+XDuMTlCaDA7YEBl7nyP46J6Mo3w3BR8lR5lqW1PrbWQsF+iHywxOV/H8+/eXeC+ X9UZx2GIq/FbUeJJL49kQSj45CNL0Lut70bhk9ZPzGHBhO840wTyo2ADLwu4AB51z8ct rAhqtfAMzKUE0ox9wlgI7p0dC+ZEb2QMNc3moH9Z+jh1L33Eb2VQP1cBjljgqKGTKKrY NwkQARVwleIWuW0J/CO8CVMlT5o+5IPPl2YXW9hNDnjwVFTZFI/2NLs4pNTASF7QW4+z tSJw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="oSr/2JA9"; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of tobiasschmidl@siemens.com designates 2a01:111:f400:fe08::628 as permitted sender) smtp.mailfrom=tobiasschmidl@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03on0628.outbound.protection.outlook.com. [2a01:111:f400:fe08::628]) by gmr-mx.google.com with ESMTPS id c6-20020a05600c0a4600b003942a493261si347556wmq.1.2022.05.25.05.33.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 May 2022 05:33:00 -0700 (PDT) Received-SPF: pass (google.com: domain of tobiasschmidl@siemens.com designates 2a01:111:f400:fe08::628 as permitted sender) client-ip=2a01:111:f400:fe08::628; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="oSr/2JA9"; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of tobiasschmidl@siemens.com designates 2a01:111:f400:fe08::628 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=T7I12hwGgvJg2vzDyox1f+9iBfWZ9bcxHLsLIMkkfT21ryX4YpLganx89Tz7pRwCCyyu98J7/88T8NcA4/BAaJ/pyP857b8CnXNI1GwZ8SQ6TeSeL0i8vIYDQxtWze91M5BDX9KGCv+qImgNuxiI8NCfZx7F9VVHWl7WZtI6ykAwP58r1hrz0d4yBvlGTwGuvz8uO3fz/ruMe3rJNY7nEVJjJuL96Jwljs3tEedSHH3efoG1k4rgPMcB7z2wrtWfRaqk0vwcHUeoUQJA4JOU3CVZN4+UF+hs7jM4K+jqlaHUyUxEbx/lAzr6wyoaA3e7fG4MFC0UmnrY4iQO3XKf5Q== 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=qBHDH+muA6AVc5CuaNYspaP/uN4fDLikj0IbGk2CIM4=; b=nI50TGk2V/+i2QQ/wePQvBKnYpYIgqsuYiUGlIpQK2GKRrKp6Dc/t3cVZB29UZ00IdC3EJshtJ0MXm0TBhsbw724ppIsQmdXt/Zfh0JE5sqWatvRTT4K9ovTkyyr/K1aNgZYXmrh9p8lrWcgsH8kZXu1qyaCDY/bmN66zWv7NI+HzdFmc1hkOJka9Svf7BmFqH0FxPIECHLi8iUXUTCiyaAeqmnC3Nn4aqYgdrKYnn0YupA1n3W+LrLAAsa8nQeq2qyMbyUp1q9L4hkl71IyChCut+Zd/EmFEBNAxGhxv3eQCvpJ2kIuzL6TMiY00lpHOqaiW4FPFnOGNgQvzEMs3Q== 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=qBHDH+muA6AVc5CuaNYspaP/uN4fDLikj0IbGk2CIM4=; b=oSr/2JA9hFtZSSKV8IoxPXVBV2jyfmthvmLbm5u0yX6glbhPUPd1uvF0CmkwU3tPEcYsWAvROd3PwfU2kj+i+tmGJdrF27mV6GAMedsQSh1GOPY9doBfV1HZQDmmPxzn7ZA0bffCrdbO6JQH1MT6kN06XPPnUykx418VwPo/wx4azz+k9nIH5OfrAUyb/trnwOY5GTV32hDNmRT/HGDoiW/jNqYBHIicAePCQ93Cs8wU041US/Vz4EgNQxLikKe1dMJgmTA6ZkgKS3bnLSnB5+43gMsSnuVzCaSle+QMs4xqzIGZmd2gHkc92ZNgXvgHEcCpPZ5fWKLSK8rABcTvfw== Received: from DB7PR03CA0086.eurprd03.prod.outlook.com (2603:10a6:10:72::27) by VI1PR10MB1840.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:802:32::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.13; Wed, 25 May 2022 12:32:58 +0000 Received: from DB5EUR01FT054.eop-EUR01.prod.protection.outlook.com (2603:10a6:10:72:cafe::6f) by DB7PR03CA0086.outlook.office365.com (2603:10a6:10:72::27) 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:32:58 +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 DB5EUR01FT054.mail.protection.outlook.com (10.152.5.133) 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:32:58 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) 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, 25 May 2022 14:32:58 +0200 Received: from wonse.private.schmidl.cc (167.87.1.124) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) 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:32:57 +0200 From: Tobias Schmidl To: CC: Joe MacDonald , Tobias Schmidl Subject: [PATCH] expand-on-first-boot: Switch from resize2fs to systemd-growfs Date: Wed, 25 May 2022 14:32:46 +0200 Message-ID: <20220525123246.779227-1-tobiasschmidl@siemens.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: tobiasschmidl@siemens.com X-Originating-IP: [167.87.1.124] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c2f9f2fd-549e-494d-f6b5-08da3e4ab374 X-MS-TrafficTypeDiagnostic: VI1PR10MB1840: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: kaOfWyzfYTb67YIwP0UIv1I0Qz66g1unjS2naM5nt76VhtRdzqzuOLnwwqFfC1HDaBxv4ZHilAVyZWDbARIhUvwb8Uqe7HpvLkqE0XCXpvvHblFShTJm2OaWWQQkvT/dz3ZldfXKVRGYNoVNhnsArTpSLyoXb9xes9/44r7lttFNXThdvzY/oLQCgCfoTtJr72eUHf61VjGfWwWpj0rM77fq3sOX3zhwxcvkzlCEAZKG4h2GP8z7sojbfuzy+Ase0q+Uw5tgy87DhFMa9phYif/Wakbl18i/yyazDnxP3t7v3zN2dK4q4cLLxLQ3c9972yT+k5QPNKcqXEFZ0Q6jcEkvEWRa9RbUVtx5oZSLM5ZA6Pg1EILS4ZroRVd//XYJzdJdiLcZXg+volpPCKYTytSCM87Ni+JID72eLm68/rB5pcenZJxNlFA+B90FWOnXj3/Qlwim8n1LI+zBcch+LAu9G5I9bj900o1+YH7EfLaUQ1ujC52FrZc+ZlGB4shbVnvsEYGNYxRVr754GV7hfCixwMh6rl3gJzhBDUM+P9H3hChUlFiGbJdyUH9bv3XGTI5TBzCBJzzI1WWYIN/LdrWXzthYmwjlR4LfV674/U14VG3js3xszQ8Y0qIQtGv34UJdPClXIcGTzjR27lolvq6BEgFHHW5Pp+eIkJkz+uSZL20iDia4GdzwOHECzAVrNoAEKJINU62ImaHATkeXkw== 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:(13230001)(4636009)(36840700001)(46966006)(40470700004)(70586007)(40460700003)(70206006)(5660300002)(4326008)(8676002)(8936002)(47076005)(82960400001)(36860700001)(356005)(508600001)(81166007)(1076003)(316002)(86362001)(16526019)(83380400001)(6916009)(186003)(36756003)(54906003)(6666004)(82310400005)(2906002)(26005)(336012)(2616005)(107886003)(956004)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2022 12:32:58.4854 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c2f9f2fd-549e-494d-f6b5-08da3e4ab374 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: DB5EUR01FT054.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB1840 X-TUID: e2PrCwMfZ9MN 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). 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 -- 2.36.1