From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7117959015048413184 X-Received: by 2002:a2e:9ccf:0:b0:25d:73c3:d99c with SMTP id g15-20020a2e9ccf000000b0025d73c3d99cmr1077246ljj.308.1657700510797; Wed, 13 Jul 2022 01:21:50 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:a8a:b0:489:e73d:dffb with SMTP id m10-20020a0565120a8a00b00489e73ddffbls601649lfu.3.gmail; Wed, 13 Jul 2022 01:21:49 -0700 (PDT) X-Google-Smtp-Source: AGRyM1s0Ayd/Z9Bm1FpMXsVauq0PGdx/PSS2fSUY6hFCspoTpkER7mTWBkO1oL6UTESlPthvTqPi X-Received: by 2002:a05:6512:1112:b0:488:e0ac:fb41 with SMTP id l18-20020a056512111200b00488e0acfb41mr1349433lfg.456.1657700509691; Wed, 13 Jul 2022 01:21:49 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1657700509; cv=pass; d=google.com; s=arc-20160816; b=Hb8v57dUq7mtoNVi7ZYboF7yb25W3SjdM8Hdrbg22dH47hHv1xQyo+XXRW2Y8EE2Kg tUDi6y+yXY8Hdb4epx3/ud16gYsfw2BTPtoRNKMiVuR6P3p2G7VZxPoiXgckR8CoaHze 9+ZVWcf6rmBbLJf/JzRx9pM5JUGkQLUdXKc47DuhAj5+KgXj0rXUmAUPvqD0Xl9aW3VV JEBoqiNrhgAXXwUQnFBrJTIuFEPomERpdOuW93S+OUcZ1tqEbp715QHoNkMZ1kVYujz0 VDyUuuZ57dgEGwmIcUmmaIwMaHEmR1Q6aeRKwWNNPMJCxiCoujoIuMOeHW9MHXKJqYAy gGLQ== 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=IToBpz0mvGsC4/xqwXj8hJJDqsUXEepD6ZfLPi02FJA=; b=tY5eJX1Bzi49I1SfkDssaLOXkdDQ/CNpKKkwQvsTbqTlBL1OVKXesxrLTHOfvTWQtn Nv0bGQKlQoc/40tZaN50Dab/h1OO6DegYTKvwQ8Q1xybRKic+vxDREOpQA9tCtOPvKAf fNl/K1V74tcqnpbUqsND4KNnu3bwWJBXix6UyI7PsgSuSizZlZ00YBgQuToCYvL6sTDV +cmLaqagexcVEAt/GyAQKeeNkG4DDyH1+eHAnW4an66w847IgnGY19qgDJuDR6WHBHmS Jzu0bTUdjF/QO4t+AB3FTW0J46hL0g+ci85Rq3aLEcX88Q+gtKMRjQfpJCnTBWlMwru1 2ZGw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=JuDNzZc+; 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.3.52 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-eopbgr30052.outbound.protection.outlook.com. [40.107.3.52]) by gmr-mx.google.com with ESMTPS id c19-20020a056512325300b00489f4f3f541si174495lfr.12.2022.07.13.01.21.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Jul 2022 01:21:49 -0700 (PDT) Received-SPF: pass (google.com: domain of tobiasschmidl@siemens.com designates 40.107.3.52 as permitted sender) client-ip=40.107.3.52; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=JuDNzZc+; 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.3.52 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=Z7dmp59Lb5R1JuBehFJ5xwV32ZhcwY5fEfjdgN0JY1kpj3eeJWHtPtYN8Ol2y6F9/Sd1WM2N+CXNpJXkqi7JN0FNSK80Z3cMx0gM4559Tf03MUsXxWmqjfOBM+QJ65Yl8fhkflmW6njza7+W1kqTcA1Aias/0U6UjidpBl9cGLoQzsiKZXBvwUs5bTUElFMqZI7/gxYJlg2vV2+cv77ZLNw6zcPc58qDqVasJWBxQneuhl4Uep2QuGrfiFWKN2aQMHw9YDxIqSbEJ/ZBO4zLKs4QRv6976HkWN31pIlJxelJ/FMic13K/YgCDNeqDM0zWLsyr6WShlh7vOARRotAgA== 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=IToBpz0mvGsC4/xqwXj8hJJDqsUXEepD6ZfLPi02FJA=; b=AF8J09dQkePC7cvDWoKpg55iqYNniF5rXfsoCvxFZ2qMjSWiwf9kx39B+yQM4UpSabayjOcRMOhOFCXat59MxufsqmtUVJSB8MyjyT0sY9Z3Vc0Td6MdlhiExWCI7xpq03FvTBu+Ny2YXOFX5bcF1nENBTNUm58Z27UxFjGHeWR84MtGtpwXhxo24qBWKZQKb0Y655H9I7nJ+cy8Syo3s6MyqphyN1SqcZGtjCSL5ta4nKeGC2jhMKMnl7Dax7+t+R4IGUMVWiJpWcV14WeEYEPzwL81LXIrJAZTxb5Pa31rsXMTYMnxb8nskotIV1EUSzlJuOLrBLCELB1STwW5Mw== 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=IToBpz0mvGsC4/xqwXj8hJJDqsUXEepD6ZfLPi02FJA=; b=JuDNzZc+dHlmBjZp9A8Od9MJh7O+Ri87WBK1Rdxr4vy2TeOMtJiDeLb3iCDJBAFX1CjJ7cbifJ9h5HxC3Hl5XpsF3k6rPhQal79nRdwSO4bk9AMuRM9UaMTwg3tcQO6JeaikJIUnRMzNmDuMmxsJPRuQFNto3sJ4LuiPULdxxRNMcTzrga+gmHnGAkzOJj7DC207C2PM25kAX7AWEalIMFbBvwUSS7c6pfxrx7q5ODGjl53NT6uU/16cS6acMp1q/I0Nn2Sma6vzqhxwPJgnccmROJ+vo1dkKP3dAvZoGNFECZfboKnBYVGKNn7ZI6tVpEPN4aBYLfhNBJEjx9SqEw== Received: from BE0P281CA0007.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:a::17) by DU0PR10MB5921.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:3b7::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.25; Wed, 13 Jul 2022 08:21:48 +0000 Received: from HE1EUR01FT107.eop-EUR01.prod.protection.outlook.com (2603:10a6:b10:a:cafe::30) by BE0P281CA0007.outlook.office365.com (2603:10a6:b10:a::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.5 via Frontend Transport; Wed, 13 Jul 2022 08:21:48 +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 HE1EUR01FT107.mail.protection.outlook.com (10.152.0.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.12 via Frontend Transport; Wed, 13 Jul 2022 08:21:47 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) 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, 13 Jul 2022 10:21:47 +0200 Received: from md3krqnc.ad001.siemens.net (167.87.9.188) 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.2507.9; Wed, 13 Jul 2022 10:21:46 +0200 From: Tobias Schmidl To: CC: Florian Bezdeka , Jan Kiszka , Henning Schild , =?UTF-8?q?Felix=20M=C3=B6=C3=9Fbauer?= , "Tobias Schmidl" Subject: [PATCH v3 1/1] expand-on-first-boot: Check size before resizing Date: Wed, 13 Jul 2022 10:21:34 +0200 Message-ID: <20220713082134.624231-2-tobiasschmidl@siemens.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220713082134.624231-1-tobiasschmidl@siemens.com> References: <20220713082134.624231-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.9.188] 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: 463c8671-8794-45a0-472b-08da64a8bae9 X-MS-TrafficTypeDiagnostic: DU0PR10MB5921:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XAaJRUtRYMxDT3HR4vSoJ7O5Sq4LZA0FC4/acvjTqNiOUzaWvQfDpSm9snJ8NVx7a6I4DurMTUY1qji+67DW+wwL3WSG6U++lVu5/TRdOX7YtEeqJFARyhjgTVIYYTmfJpOvWjfB7xSjvtn3PWGU/7+gpfhYR9ILuSFZzg5L2yiUf66v1JY0oH1pVezK5t1fo/o9Vo7tlUAY3tALF5WbDex3THJVBC3dR47JM/t2U3UFRCpx2KIPWeDmuN+KllzBa1SMN6zgq08iunKgfe2pJa/3Mfev4D26ny8oKP41McWpEY20ArQJKle4oxtqzHNajvxdzlrTd6UAhzPdSGDogPptkA9s8god5cG+00hiz/g3mfBpUG8HET15AEVf5EiisHl3/nK7vsXfVsXRijOJrehk1Bx3C2iNsw/dQOgJ7bQuviUJUBSvtbHc+1iaf1do9uISDHs0o65JHJX6BacUULNVxrFo+2AR7ARKTosClUwvzbu/KoUEpJD69+Lzdh5MRWOlVqB3WWaYrEnNjR0j69+0kyD8iNp5LLRu93nr/Xlm2kAAwJ8vxQhMoKLAYV/haBUZeaCWbRs8G61pZmLT0xkSaqfO1lwBNV8TWd/Q4ViHTsn/EHunvpiyJlbCeqzBhl6Ge1Phh3vqVSsJ90pYAETzvTlyc96hfcJ/Myj0g3p6Od9RPDvy2dOy3UOvvl2vLPQQOQwuKyHnhuH4V0HVQnxwIZbGvbX8jqfgRqy8QgvHqw0P5cjjFJYoD3zv6aolt9SKVmQjdbULmTjxmeioL7R8VJbJWCGQ2aNqhEECV5N7hlOWUmD7GvoCKWJq+n5DjtaQ5qZDTNpgmSrfWlf76kFRG6a1f0soWVtfneXpgfo= 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)(39860400002)(396003)(376002)(346002)(136003)(36840700001)(40470700004)(46966006)(36756003)(8936002)(4326008)(83380400001)(5660300002)(107886003)(2616005)(70586007)(336012)(36860700001)(956004)(186003)(47076005)(1076003)(16526019)(41300700001)(82310400005)(70206006)(86362001)(26005)(40480700001)(81166007)(6916009)(356005)(54906003)(82960400001)(40460700003)(8676002)(6666004)(478600001)(82740400003)(316002)(2906002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jul 2022 08:21:47.8698 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 463c8671-8794-45a0-472b-08da64a8bae9 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: HE1EUR01FT107.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR10MB5921 X-TUID: OHZidAAG6JoO If the disk is too small, resizing might have detrimental effects. Because of aligning issues, it could happen the the final partition is _smaller_ than desired, which might lead to an unusable last partition. Signed-off-by: Tobias Schmidl --- .../files/expand-last-partition.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) 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..759ff8b 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 @@ -22,6 +22,22 @@ if [ "${ROOT_DEV}" = "${BOOT_DEV}" ]; then exit 1 fi +# this value is in blocks. Normally a block has 512 bytes. +BUFFER_SIZE=32768 +BOOT_DEV_NAME=${BOOT_DEV##*/} +DISK_SIZE="$(cat /sys/class/block/"${BOOT_DEV_NAME}"/size)" +ALL_PARTS_SIZE=0 +for PARTITION in /sys/class/block/"${BOOT_DEV_NAME}"/"${BOOT_DEV_NAME}"*; do + PART_SIZE=$(cat "${PARTITION}"/size) + ALL_PARTS_SIZE=$((ALL_PARTS_SIZE + PART_SIZE)) +done + +MINIMAL_SIZE=$((ALL_PARTS_SIZE + BUFFER_SIZE)) +if [ "$DISK_SIZE" -lt "$MINIMAL_SIZE" ]; then + echo "Disk is practically already full, doing nothing." >&2 + exit 0 +fi + LAST_PART="$(sfdisk -d "${BOOT_DEV}" 2>/dev/null | tail -1 | cut -d ' ' -f 1)" # Transform the partition table as follows: -- 2.36.1