From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7117959015048413184 X-Received: by 2002:ac2:4d93:0:b0:489:c69d:59c0 with SMTP id g19-20020ac24d93000000b00489c69d59c0mr294907lfe.329.1657278978525; Fri, 08 Jul 2022 04:16:18 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:178c:b0:25d:53ed:1894 with SMTP id bn12-20020a05651c178c00b0025d53ed1894ls497842ljb.9.gmail; Fri, 08 Jul 2022 04:16:17 -0700 (PDT) X-Google-Smtp-Source: AGRyM1s3L27XsdhS+dQeokd7+T2BXjYfvoNaUuFv3KmQMrE/RiUmBBs4GFuNp12LHG9QhwJNqkNu X-Received: by 2002:a2e:95ca:0:b0:25d:5b07:53cb with SMTP id y10-20020a2e95ca000000b0025d5b0753cbmr336211ljh.387.1657278977339; Fri, 08 Jul 2022 04:16:17 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1657278977; cv=pass; d=google.com; s=arc-20160816; b=nuXzOa3V9TemBSuVW74fAxkC5YLocX7qJFivZQyvGnd8TrpTvTEs/I9092UU6DTDAG OdJ9nAlPL93EJCuvkeIPNGzl2VFh8zghvGdRJRGTDS1oXlsjkCY2HUIu7FAQ6AOD4XDH QlWqlwLBns/w9clcmZVI1R/98xjR0W8GpNzfKnlvcNG9TOVZ3zkLuV4UxlCwn/vXj3Tn tzNaedJp+rll5g+7XQDeN4X2Og1HiPJ7e3jCjPqdnGpW1eDp0nmPxJV6Oy5ybXgHHZUn kU/2FQpyCLkalwwv0ZoBifET+PnBc5jD7mdU6zEpKt2Jrts/+PTMk9p+6q1fj6IuAnvK 01Nw== 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=Ertm2NGiYjWhkQ5Zn1+OfdplwzNUSP0fo3uYGGgnzFs=; b=ZWMoafS5jWzmzSOefDCkMQ4JzFymWXk4BPM/qHVpBWRz8FKFnBQ4ntWrHfs4PVnILU zvaFRk4/uq/2kY3pTd/uGnYtm4MGfqDvU9ovoIDhEgYYF7C0DEG1db4/2BiTNKpKJhAU D73xdqC/EckN2c4OoJzIZgoSCt2+olYqIXmgNzhLriAy7pPHg/swpmYWHdctV0cIk0+1 hlFiaxEf/j7PKW6NJS2HjDQNFOi05UVlPGdOGdyDbD7aMAYjL77fXQGB1TlsmoxSf4lz nkavcvyfCy+K6v+XAm5hQNmAyAiOxAuGUSNTJ6iB5qpce6B0OyysDQHuDacdLWxwakJ7 cIpw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=tY0qDdtS; 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.0.68 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-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00068.outbound.protection.outlook.com. [40.107.0.68]) by gmr-mx.google.com with ESMTPS id c7-20020ac25f67000000b0047faa025f65si981993lfc.12.2022.07.08.04.16.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Jul 2022 04:16:17 -0700 (PDT) Received-SPF: pass (google.com: domain of tobiasschmidl@siemens.com designates 40.107.0.68 as permitted sender) client-ip=40.107.0.68; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=tY0qDdtS; 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.0.68 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=CAknqIZDrnpzCqMYDhBBOrw4d/rkLWv6oRB/Z/RUD+l6D+ssQAJZBgMGEiQ1/178IjEZoQ0+60iwyJdnZptvFoCEcWGuMB/2ohvHL6fO3+hjDbQ5GXKdM5BXnvaknfKSKT1uhwTppPi8ZgUHxN7yX10MVCYGA84MMTUjddrRuzh/c1CrSKmcH0J/ETyI48oJ6SZyYNDnvc8rodlJtB7tXBzh6J9l9HETHhjdLSjyeTbtGwLTOmc4I7gS446eINEBVZex3PVMkJ38/dNtZdP9wjyvDkYUUPSrq0CYZDkFLDF73Ce/SyCVHN6g7EqAJqoU8sXOSiZtuh8TC72sa6t3Dg== 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=Ertm2NGiYjWhkQ5Zn1+OfdplwzNUSP0fo3uYGGgnzFs=; b=KJeWz/QJhrixbxHFUsYCZYDwU8pqXUjAr1Qts5MYrlspNTSqqOOi1ewYD1r3nropTUj9/1CquHCiHb9slRMhIf6sFWrTsBNmxzsVwG6stQrNk0YY4cZjZnOfHTRppQ7DjDjgik+LfUdhwSU3K5fDwQ7JeEwQZVeq3cm1398cSQf54bpkNls9U88ZTvpXUDHsXXZ9pxVlU7GUqPhoEMJori2bQoB3rcq+0dcQL4ABFf8vzghT9JX8dQNlCE8OgN3C0c8AKdo9qiAp1+wk6qljTKvemHxXZkroCAS3IWnVnXmMxiOdcH1HHxRRmswGBpHZkLSIrpycXytvGeadhqQuhg== 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=Ertm2NGiYjWhkQ5Zn1+OfdplwzNUSP0fo3uYGGgnzFs=; b=tY0qDdtSYi/XMPoXmMFJC2UH2d7IjAV83u9NIBdPv1bouxFujYER9q0TxkvX1sWiT23qYhlgGkcRn+8iIDLaclXqDNzk3A7jEogHEu8hjAFcFJe1na1N4WceBJl1qot9nUI6xiupz8dat+xuoPpFm/jYN6Kxs5O05GnuWVsGFsK8IYOgCMs7Zm6DukqpaZZJxt9apEy4M22jOmB1wwZDq0xW0VTcy+VqHJheYdcUH4swU3/xhiy3QQU6MWtwik01Y3ePnJzpdb8LjN/FY4/w8YkmDkpYdlWVfJfTsVg5rSadp3XcA49HOlMXs3/e2R2jM5UD6CFIgsDh7Q9WyQIymw== Received: from OS6P279CA0027.NORP279.PROD.OUTLOOK.COM (2603:10a6:e10:33::12) by DB9PR10MB5379.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:334::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.16; Fri, 8 Jul 2022 11:16:16 +0000 Received: from HE1EUR01FT013.eop-EUR01.prod.protection.outlook.com (2603:10a6:e10:33:cafe::c2) by OS6P279CA0027.outlook.office365.com (2603:10a6:e10:33::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.15 via Frontend Transport; Fri, 8 Jul 2022 11:16:15 +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 HE1EUR01FT013.mail.protection.outlook.com (10.152.0.160) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.15 via Frontend Transport; Fri, 8 Jul 2022 11:16:15 +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; Fri, 8 Jul 2022 13:16:15 +0200 Received: from md3krqnc.ad001.siemens.net (167.87.8.144) 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; Fri, 8 Jul 2022 13:16:14 +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] expand-on-first-boot: Check size before resizing Date: Fri, 8 Jul 2022 13:15:21 +0200 Message-ID: <20220708111520.662382-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.8.144] 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.421500-8.000000 X-TMASE-MatchedRID: X0C6SOYuDKdhFg5SJFqvY1JdwjEpzd8XVUQltXfJ7ZblCjTeYR3AARfJ TYLG2XFved7W0JF37s+ArqoIZrVn12ud8Xiv7hluZxOniNxtHg3vvdMlcbnTiD8Ckw9b/GFeVa3 vVo6qkMNHpEd1UrzmFfJ1LiYh+xB8WDbJm+OuiVWt8/SSH+XT0hItOdh8xZl84a0R2NfKInCi8D /o42y/Sia3LJCqudMEngIgpj8eDcAZ1CdBJOsoY8RB0bsfrpPIXzYxeQR1DvthT3ZSJj+gR0d+4 rCk0XF/3KZ6f9yy+bbQ5/7gEmTa9aE6StoD9Klh X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--11.421500-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: D31A3D53B9CDA7C9739D03DF5C46DFCD40B586386BD1391784D06D97EACF9F3C2000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 145ae964-4d18-46b6-0ea6-08da60d34619 X-MS-TrafficTypeDiagnostic: DB9PR10MB5379:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1eP9/ZCiCD/w1bkWyaeu9cWrErzY7XK6ZH8iZoD7JZnijIgzZhGDFfK1itWMxjUTAQCgO28zEpnTLv9RVR+S1eCnSst4rk9dKqpvDMQEYNnRpE9wlA7VcpTw8v8O9NYJPnBbcah7whUe/nZnWoW5m0abvVNp/FfxfujGTnA3rBQ+zfd5qcnsFLgFmHil1TSOBcnzH3UiYgVMKgL8yuNUnSRjj5I3sSoWdmmXQfXH96ufY9QGOU6dyxdfTRf47JWxwSIjWAK81fpTY4dPLm7KjlrYTP/lA5silOITTqlwixakfLJBzJU0YneVtmd4KDXMyUaZpdiJ1QWF/8X2Urws6Ujx000TTpypF2v++nWUIRZ7XbNjn41g1SrnJlkaGfsvnYzeWye4cBx8TR+/Vk9i16z/RdTnYz1QpRyFC3GLgL1rKF8YoA3SkDtJ1QE46Nx56cnwtt8L2bjPNhZHmvjXU+8cm9JPe7GVorPPLpVEmzm3C9xuUW/yF2Q8gAjQUZZt3S222oT1ewMZObjlpm7UhrXtxFN4wCMAt5OeDByCtWc0cj0TVljeTwffnbcDv+U2bm9HBU1WEcweqE9Z5VZNR/6GM8fuHidzUbncfwZFtfVrVgTMd4QJxDIwrpKomzBEc8b/TlTnILWPD8EB4ZxjcX632trlI0oVhB9SUV3m8kynKz7gVIgfb0rZ5EJSQYm0L/kiZ9Mrdbqjdy2wTp25h9kKbj2d03ilHztN6Yg3e+jkx1II+Ihm3nVmcS7pLvmoJ4672oVYmWddcecTueXiq70JD9rFc5IPg/vAg4Nbo1ofWvp34IfeUWoQdTyw6Jj/ 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:(13230016)(4636009)(396003)(39860400002)(136003)(376002)(346002)(46966006)(40470700004)(36840700001)(2906002)(47076005)(40460700003)(82310400005)(186003)(41300700001)(7596003)(7636003)(6916009)(40480700001)(83380400001)(54906003)(6666004)(336012)(36860700001)(8936002)(36756003)(8676002)(107886003)(70586007)(316002)(4326008)(26005)(70206006)(82960400001)(956004)(356005)(1076003)(16526019)(86362001)(2616005)(5660300002)(478600001)(82740400003);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jul 2022 11:16:15.5978 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 145ae964-4d18-46b6-0ea6-08da60d34619 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: HE1EUR01FT013.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR10MB5379 X-TUID: U3o9J2cGLQZX 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 | 17 +++++++++++++++++ 1 file changed, 17 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..3b944be 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,23 @@ 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}"[1-9]*; do + PART_SIZE=$(cat "${PARTITION}"/size) + ALL_PARTS_SIZE=$((ALL_PARTS_SIZE + PART_SIZE)) +done +echo "Disk ${BOOT_DEV}: ${DISK_SIZE}, all partitions combined: ${ALL_PARTS_SIZE}" >&2 + +MINIMAL_SIZE=$((ALL_PARTS_SIZE + BUFFER_SIZE)) +if [ "$DISK_SIZE" -lt "$MINIMAL_SIZE" ]; then + echo "Disk is not big enough, won't resize. Current size: $DISK_SIZE, minimal size for resizing: $MINIMAL_SIZE" >&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