From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7101651034648346624 X-Received: by 2002:a05:600c:acb:b0:397:bdb:ffea with SMTP id c11-20020a05600c0acb00b003970bdbffeamr18850845wmr.56.1653910671598; Mon, 30 May 2022 04:37:51 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1c1b:b0:397:70f8:bd74 with SMTP id j27-20020a05600c1c1b00b0039770f8bd74ls6507682wms.1.canary-gmail; Mon, 30 May 2022 04:37:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9RG+hhNRhJDv6kHHgGF7Wq9QRE/hlqdXVZ8RGUpgd+8CB9Vxt3w9/k6jHuLdpaXfN3Rqh X-Received: by 2002:a05:600c:2e04:b0:397:7421:7764 with SMTP id o4-20020a05600c2e0400b0039774217764mr19216997wmf.145.1653910670604; Mon, 30 May 2022 04:37:50 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1653910670; cv=pass; d=google.com; s=arc-20160816; b=RiIdGTqX1Nc1ZdkfoEgo5k7WygnstlyZSMmwZZJ0Bmet/Xu8eUSolYNGOVysLTNzWB CZlMH3f2T+KgLsvO7A0zqQ9cPHdoAnnMW+eLCNLqpOJ/mkt8es9F1lY0y4BvR9jXgU9M zlT1PVaEJIJCZGQm2YAY4lgNYQZ5D4pt8FdHkew0iGr2ouV85yPJuzqZQsZ1Gi0sVyNO rndFjDNtmWU7xZ6lQZZ9wtOD/SzLMfM3P9vURAsTRG0jo6lN9Jr8BMo+GEyRcWR3Hdpd oo3JQ4rShdnDcTLR7TUcdTt1fxTw1ZoJM7ws/wZwTxx9yIxUw85QEDaQqV3Ygy3YCBuJ 4Jyw== 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=KQ93TqJICheCdJasQbfTmBV+t/dHzzgNJkxvsUhCLjs=; b=uNlwsbDwhNDfzZMRgDiGW0R/PNN93WnXg48s6tcVZCZtgWcl5isxN57h/OknkzDfNy Zp8EiPU0C1qZovUiweel+yLsMwR5E/b40YkKS8HWSsbThw5H1nJOjLQ7jX+N+yiKuTdt vbebDh61T+tvxKp/Dm311PUZIErCr1W/D7bexyhziBrwULb/dGQcHErxWIxmdxDyrfDp F5mrScR6Ykq9FkSGXoZYT7IX517+JEkpudh98HAv9t+dr7zF8vqQq9/whmOIYgPLOK8p KDnsBUdpMRg55FuPLF3c5g41FKAo78oVAASfJH7eon19xnl1DFtBJNNVkyogtjvhaoIK iwUg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=mR9LOz1K; 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:fe05::62b 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-HE1-obe.outbound.protection.outlook.com (mail-he1eur02on062b.outbound.protection.outlook.com. [2a01:111:f400:fe05::62b]) by gmr-mx.google.com with ESMTPS id w15-20020adff9cf000000b002102f9fcd7bsi157544wrr.0.2022.05.30.04.37.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 May 2022 04:37:50 -0700 (PDT) Received-SPF: pass (google.com: domain of tobiasschmidl@siemens.com designates 2a01:111:f400:fe05::62b as permitted sender) client-ip=2a01:111:f400:fe05::62b; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=mR9LOz1K; 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:fe05::62b 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=mFOgT7igfzAbFKiS0Lnx9xrrtWE4u0HOB1i9ci8kRrlNJAkwCRdPqafOm9SX0elrZ7ml1GoXPyUHgCe22B60cukR54u3IAq+d0qd/RwpuXJWkIrf70W6WY8c3hvY4vWn2npjaN8SX0EturOekJnqoZdzl873ypdrxzkjv4TfyjHeDx1+/SXdtohilif4HGBic38xZtLCOSeQWjk8lHipMrrBpYfK5Ji7Kp6h9Jli3r8YU2Mf5xhOH+IZLrrfXONTYsqbqvvmW0FLubN/sZO3pm8EDB6EMpjjnTw99ptW1TKRpNda7nndfvgyXEUwovFZ11nZ19vDWISrZzuRCMCM7w== 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=KQ93TqJICheCdJasQbfTmBV+t/dHzzgNJkxvsUhCLjs=; b=S0gJfE0qIgjQ0RIXnJVHB9ZbQ/ZKQBb/XEZC57xNMv3t6sE3newG7zYBlaPoUIyZEuh8YjxBWIH06CFxJsVOsPYA/Mm18xv3o4NXI2/O03O+vgrwCdWP3GW3yYcP4g/ykAylC5O8/ucNQeeXAfgWg2+2e1XfB862iwf0dkJy1FLkoz3BS96EmrvlBg9xCPo4tWZ+is7tss2ScrvOJDPmZaLi7oR0KmxgTqjgr+2r8/x5EOhD9Dixu3objQi+yKcMR9ES73h65rzoXxWNxKVZychoDmP/55G+ZkKufqXR8Uck8ea9k9dkegxcr0EMphqwTcwaOZz0FoswSwZLxWcyVQ== 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=KQ93TqJICheCdJasQbfTmBV+t/dHzzgNJkxvsUhCLjs=; b=mR9LOz1K1r8tD+IIcDseDB7ddo1Hie00oYUCkE/IJuP+Xxo7KGuYNoMKBuvu/1dgCnwvEKif7TMW9JPiPaOalHdAF5HERaG//ofQnPTZpHuTcu1cgYvHeUGJ7wweSAxkajHBMB8WXTiWrXwkIa2kVDJzHuyczkJjhpP3q3HUCT0qhM7crCPgZQnR0IVlBJTR7gK0pxz1+IouzW8U9j6t4CIZeKSroYlELxd9uSG3Df6PI7/bo95o6ld9Mys5iVmazLbvfYTKIzCFMj9bKo1BEoxOykdJF9doSkwu2oHRxvxHZ4PjlwQv49w+eyzim3k/nK3eYtrhzwJ7LMAHJk4hBA== Received: from AS9PR04CA0070.eurprd04.prod.outlook.com (2603:10a6:20b:48b::16) by DB7PR10MB2284.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:4e::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.13; Mon, 30 May 2022 11:37:48 +0000 Received: from VE1EUR01FT056.eop-EUR01.prod.protection.outlook.com (2603:10a6:20b:48b:cafe::33) by AS9PR04CA0070.outlook.office365.com (2603:10a6:20b:48b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.19 via Frontend Transport; Mon, 30 May 2022 11:37:48 +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 VE1EUR01FT056.mail.protection.outlook.com (10.152.3.115) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.13 via Frontend Transport; Mon, 30 May 2022 11:37:48 +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; Mon, 30 May 2022 13:37:48 +0200 Received: from wonse.fritz.box (167.87.2.55) 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; Mon, 30 May 2022 13:37:47 +0200 From: Tobias Schmidl To: CC: Joe MacDonald , Tobias Schmidl Subject: [PATCH v2 1/1] expand-on-first-boot: Switch from resize2fs to systemd-growfs Date: Mon, 30 May 2022 13:37:37 +0200 Message-ID: <20220530113737.612324-2-tobiasschmidl@siemens.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220530113737.612324-1-tobiasschmidl@siemens.com> References: <20220530113737.612324-1-tobiasschmidl@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: tobiasschmidl@siemens.com X-Originating-IP: [167.87.2.55] 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: c9043e60-a6a9-4424-ea00-08da4230d29a X-MS-TrafficTypeDiagnostic: DB7PR10MB2284: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: x8XgMB6DEJ2ufu934QKngaZMrWWnsVY0RPnUxaSnP8da5tSwfbYMC395wGQVCt0pNPrNRwrk+2VfrLV8UCVkjNyV6OOKDD1wjYtw+0H4ovuD/nPFkJCf+FQkZMy3zSIjwSSWhvECc6o7DPRLjjvtyi6hL4NRR5DkZgdTzayjvLEwwJURPVVnhau6Ai9CElnX+piIRc6REOt9jhR+kwr0n33pv+4w3Wh5L6B4yweiBqeVt7SVnY4am9n2ZP2I2s03OBAJH4o0oyKSgs2uMP1Iwq1+7/tXqfVgXsXAAaYmAKS0ZDBXeflqNqZbekFloJ4CEzCOW/qqVVIs1knihP3xWf06uBQLXHMeesw+jAY8ipPwPOncQErzPZupKvesSAHR1YXQB0mK5p3GTDIaMAJMxiBKvC70QxkCjVxABTFKPVPe3k//YS14zA8HmT+TkBA3wZxv1lZ4iP2bymhjLSAZrsGH9U5kXM7Am9W/p9YBG0vMRYTdSntUKkg++9JKBDbhfJhv7nrXtZQBF5z5/tLTGFGHLjt1fYS3Q/0So3XaikVxLdX2pkeMuRRQYLb+FtI4KwoN49/nqhZqmDK/TOONxtdJ0T5pUnyhHdElovIedvS+Xf3Aj1nvFn9rjpGqUMTfspgl+BZtrMf1EQj3cm2Laam1AnmtQftIV4sUC0rDF1//lQf1uDgDDDbRhXE4aSLc8nwCImNpon1v1xAu3FUxgA== 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)(46966006)(36840700001)(40470700004)(356005)(82310400005)(86362001)(81166007)(83380400001)(36756003)(54906003)(508600001)(82960400001)(70586007)(4326008)(6666004)(70206006)(316002)(8676002)(5660300002)(186003)(2616005)(956004)(336012)(107886003)(16526019)(47076005)(6916009)(36860700001)(40460700003)(8936002)(26005)(1076003)(2906002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2022 11:37:48.4952 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c9043e60-a6a9-4424-ea00-08da4230d29a 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: VE1EUR01FT056.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR10MB2284 X-TUID: I4nIsvkFEnAF 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 --- .../expand-on-first-boot/expand-on-first-boot_1.1.bb | 5 +++-- .../files/expand-last-partition.sh | 10 ++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) 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.1.bb index 1703a64..09ff234 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.1.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, e2fsprogs, 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 bb371e9..37e94ca 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,10 @@ partx -u "${LAST_PART}" # when using systemd mount units. export EXT2FS_NO_MTAB_OK=1 -resize2fs "${LAST_PART}" +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}" -- 2.36.1