From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7101651034648346624 X-Received: by 2002:a05:6000:2a9:b0:210:2530:be32 with SMTP id l9-20020a05600002a900b002102530be32mr5134962wry.153.1654199176301; Thu, 02 Jun 2022 12:46:16 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:6dab:0:b0:212:d9db:a98 with SMTP id u11-20020a5d6dab000000b00212d9db0a98ls150595wrs.3.gmail; Thu, 02 Jun 2022 12:46:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwajQ8KXCiY83BoORfD+NME4RwfZARfUzDeAxKe0hUK3KdCk0FCHAfFpv0FS4+KlXZ3mNr4 X-Received: by 2002:a05:6000:712:b0:20e:60a5:b12 with SMTP id bs18-20020a056000071200b0020e60a50b12mr5110362wrb.591.1654199175382; Thu, 02 Jun 2022 12:46:15 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1654199175; cv=pass; d=google.com; s=arc-20160816; b=O/Oim+h3Zv99/Yl70WH2AzhWWWrHPKddTdgaLRPmcCNOifRwTIE8xTu/2J+kM/4e8s 2m6f98+5EJYpVHDDU9Y51dIlnX4kdumFf4zFDFdSxu1p2VbfaaUpaZtg1jEF6g9uytzz nG1B/vh0PgJPT2HDZc3cms567FQUovstbWsk5VfYr9G4lV9dgxKcfvJsUYQORugeR3Lg U1likmC2hwCqREBsJxNVgbtBuSnHGOqS8wdKDw4sRe4c+H0EV1XBgQEpwwXWlSrR/LV/ uD1W/XPl7SHEdE3tqsHeblhFtJVQ50S3iTNlOTyDytcUhPVPT1GFY1aVTMFaGGIlAVGM +vZw== 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=8qyCKJwP9o9w+So6HZNwVmp37cWudakF+AA52pOqMUY=; b=QqWHjhj01tQYyFRt1uFNCBPERC9qlfO/ReI9Q9SxGlUBrhWtSWVcouqoyaVwA0MEx4 Is01S9AEsAAIh6lGVMDvuPR+blQWKaXbYBxG2YnWdckpwaDrGAeUBqu0UdpDbpYjBro5 Ne+8AaYhVVGfA7vpztayZlX61nDQD5NKVtT/f8sBarWgB4IvjtNoUbbtAlXBS/E7/WZe dXLP+Yrirk02BBxEk3SkXADhVU2o9yzLn4nJmoHWrihd1jW99xnqzsTDxvl+82aaRYKT ExD6HBJczu9EBlXXiGf5QCCcqE00/oQU6zTC3LvmNsW/h7By2APr1pvN5fMwvGGmVBkA sOJg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=KHjGvV3v; 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:fe1f::609 as permitted sender) smtp.mailfrom=tobiasschmidl@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0609.outbound.protection.outlook.com. [2a01:111:f400:fe1f::609]) by gmr-mx.google.com with ESMTPS id u10-20020adfeb4a000000b002103e166ba7si282905wrn.6.2022.06.02.12.46.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Jun 2022 12:46:15 -0700 (PDT) Received-SPF: pass (google.com: domain of tobiasschmidl@siemens.com designates 2a01:111:f400:fe1f::609 as permitted sender) client-ip=2a01:111:f400:fe1f::609; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=KHjGvV3v; 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:fe1f::609 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=QuPfRv01gbQxHbYUO7T19GwIf6D83wk0RFWCOuPtBoSuOqKtqiSbfzXQz530nLMtZui5hLoIy3fhrjj9+3RAl5w11hqyeJHYxvZ+Ib9+pzMjBf6TPDEq9quDCUn4Qkjbd0z1b8MZ9MwS6q/t8qrort8FlsunagpDw8OlrMC6YTiX66UhdufCRjmGpHOmZW8HuvJiuhfkTMppTIW98/5PGqlMB4ph+bB1+RBnmsJuhsnj/NsUyFkSO/uhLIimmwpelsK6p4tPM6BeErhtgIfDS/Rof/RgprnmOp0+VLqLdhsa8wKzyGemjF79Dmrb80mX41JyzEjGVyj1/7qsOCrTow== 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=8qyCKJwP9o9w+So6HZNwVmp37cWudakF+AA52pOqMUY=; b=koMIo95pCNIxzaTk8AzMqTnODpB3QoK9PKkYfg9JBTD6V/fSWHCVrcs+9P7jJy+9XRlZ+ZpSNvOWmlpOFbDzJZRN8sj2sXHE1KObTn+IM6jkLfpjSe2a40158VgmzFXwLcQ2cmvuCUgzunCFRbLvjruNqA8XuW0XHpyHqKWaDCfskmrKlp7zLZhAqOrnlgvjhCU0mlL7sbrkof6o+b5WrC+20+HzsZGhQN1aZU29Woea5wDEg16CmczGEwqnHXbOMQBGyev2lz7mAkgEVF/IXzDllaDSvo+/+CVf/aNBndJRaHe+0SkH/UvzYVp6VT4kbZ5vqqZ0ZnjfBI5UePF6Jg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.70) 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=8qyCKJwP9o9w+So6HZNwVmp37cWudakF+AA52pOqMUY=; b=KHjGvV3vjRAoFDFZgpKbXZY7bM4q1YByGyv3e/AveUMMaLC6pRRwcvn2iD1GvEgOX0JFqMN/mKURSo37pCezTw4LP08P40H+9oqgeOsVZtob7zpIV9Sl1EsZSHYUhRWI8oe3Ptt3RhgU4xeS1TCrCjejDckSojgvVCzBqcKUcB7wFWotVoLi+Rdx363zXqri4/8UueA7XQis+7ghOzj/wFFyNJgN/CDm3Xgb2qUt21bSuR/XoG27iNpCAAIqfpyXNE29QatpbzMc2OtLv0wLAIzP7VEP8E8Fb0LYpXUQ7R1EG26WNFWRYo5kcXFMBhfvuXkyZwY3WQNa95Sr3jwhvg== Received: from OL1P279CA0056.NORP279.PROD.OUTLOOK.COM (2603:10a6:e10:15::7) by DB7PR10MB2092.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:5:7::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.13; Thu, 2 Jun 2022 19:46:13 +0000 Received: from HE1EUR01FT006.eop-EUR01.prod.protection.outlook.com (2603:10a6:e10:15:cafe::19) by OL1P279CA0056.outlook.office365.com (2603:10a6:e10:15::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.12 via Frontend Transport; Thu, 2 Jun 2022 19:46:13 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.70) 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.70 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.70; helo=hybrid.siemens.com; pr=C Received: from hybrid.siemens.com (194.138.21.70) by HE1EUR01FT006.mail.protection.outlook.com (10.152.1.228) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.13 via Frontend Transport; Thu, 2 Jun 2022 19:46:12 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) by DEMCHDC9SJA.ad011.siemens.net (194.138.21.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.9; Thu, 2 Jun 2022 21:46:11 +0200 Received: from wonse.fritz.box (167.87.4.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.2375.24; Thu, 2 Jun 2022 21:46:11 +0200 From: Tobias Schmidl To: CC: Joe MacDonald , Tobias Schmidl Subject: [PATCH v3 1/1] expand-on-first-boot: Switch from resize2fs to systemd-growfs Date: Thu, 2 Jun 2022 21:46:00 +0200 Message-ID: <20220602194600.748443-2-tobiasschmidl@siemens.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220602194600.748443-1-tobiasschmidl@siemens.com> References: <20220602194600.748443-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.4.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--11.840900-8.000000 X-TMASE-MatchedRID: KUNyeYH5DEkSoMXQbDenYUXpV/9Io3LGB81uozkhVupbUzvsaHW6BqCu yp8pw7JKgU38wRbnPPIS5LnfGo4vrXUNjnbmgqQ0QG62Sn3aGkztWteqKqfAdQi0LLplf+Uv69x ONVZSrH1sM0gH0rnSZqP7P89oupYwdDtyrAUAFQNT0gFhwwXJ3RC0quJvMyl3kbMiEOIxZeuc4S 9ubwU6WWwddpjY2s7XZlj9F1etQo0/VesZiTx/bXQbfv/5+bbQj2hRzH1UwuAURSScn+QSXt0H8 LFZNFG7bkV4e2xSge5zUZsF896T/dArnlgcbp5+qhif3TDt90Hl0Ac+MJHgzh/BXqwE9HSW X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--11.840900-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: B4E32641A95B429C6D81255A952E085FBA24E2D909B2240C18D31F240CC336362000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 511e2bde-8e99-4a03-663c-08da44d08c90 X-MS-TrafficTypeDiagnostic: DB7PR10MB2092: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: l1bZ3fK3rHLA8yJ2QX/CapPJXptjs5raypxcf5YQjwxUz7iMsNGSYLY30knMVwdcBiG/z93JBxzYjEX0Ab59Eg3p8Db86ocVcJv507T9C7cKGxJnJF1by/4Vfam2IE1PK4hZC6vJa4P6zyoGDHZbMQ539Zdd7Q0MfixgaIzN/MXHlEimB6zXnLj4xSGHIibPf8VGaQIHz/8qHzhapH9tyU00O6TOHgB+IAI0fsEm4QsisgG4S1rTCtBrGUDjn9LVnubdwxsmIAiPm3G11pxUrrrdOOF3hWx7w6o3GvsdZSYrT/sAW29icaX/a1w2oe/mMixj/ifJDKH/h5vdLfS06lKN6uIkDafJETX9COKjt3S9A6rE07u2HIj4OKbW5Fsvdr7sjGGgQqlL5tgs8DY3LD3usVD/no5TShpgYkPqm09MV8EJB4lSUfqDIqbY5TD28rLKrDExt9zLzhbHmKpeok/hMr6CVzV4mkQxf8k4aEOdvE3qstbFzNAP8IJ4gfWY5bIO/Pt2gL2nFCshg9CrrxQonT5SYQ4neqpoFWGHQ1A8jQGj3lCZnIuphdj9ssZphDpTbAN5HI1hcbMJmKu1d8yq3sOicwE7v3lLi6JRIuCnqBWI6IYkUevbkQHnyfioI88N38ac4/jxxJdiTC0RecINQOzRPN52IEpsYSQI1DdSEvZmONqYlUK3jN8yuUAK X-Forefront-Antispam-Report: CIP:194.138.21.70;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:hybrid.siemens.com;CAT:NONE;SFS:(13230001)(4636009)(46966006)(40470700004)(36840700001)(40460700003)(83380400001)(8676002)(5660300002)(4326008)(70206006)(70586007)(107886003)(186003)(508600001)(8936002)(1076003)(86362001)(82960400001)(356005)(7636003)(7596003)(82310400005)(36860700001)(26005)(16526019)(956004)(2616005)(2906002)(54906003)(6666004)(6916009)(47076005)(36756003)(316002)(336012);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2022 19:46:12.7672 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 511e2bde-8e99-4a03-663c-08da44d08c90 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.70];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT006.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR10MB2092 X-TUID: FXH34j9bMY0o 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 --- ...n-first-boot_1.1.bb => expand-on-first-boot_1.2.bb} | 5 +++-- .../files/expand-last-partition.sh | 10 ++++++++-- 2 files changed, 11 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 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