From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7321338948658135040 X-Received: by 2002:a05:6870:d8c7:b0:205:ee93:1875 with SMTP id of7-20020a056870d8c700b00205ee931875mr7256224oac.73.1705239580091; Sun, 14 Jan 2024 05:39:40 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6870:1b89:b0:203:d1ed:2a38 with SMTP id hm9-20020a0568701b8900b00203d1ed2a38ls1159611oab.2.-pod-prod-01-us; Sun, 14 Jan 2024 05:39:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IFiUZ1bqj9l6Y9mz4P8WbglTS061zq5OpJIxrZMxE9sww5hMk7ZpzTQz05bPIujuEu1IPNb X-Received: by 2002:a05:6808:3308:b0:3bd:4cc0:3ba1 with SMTP id ca8-20020a056808330800b003bd4cc03ba1mr5676996oib.16.1705239579332; Sun, 14 Jan 2024 05:39:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705239579; cv=none; d=google.com; s=arc-20160816; b=z7Ju85FtCkF4Qz9DlpfZlKoVQxjaX4Eimjtom07o+fgUzDsfZ3xe97m2WO7Jcg1sH4 DgPrP92vG/X5RjQaLqw+0PVsrKU6zwFaOd/UCZ0dOmEWpBNmZ696MGA5y6hUp5rA2xG+ 7SOo7P1c0lm3wVwQk5kPFZk1DUY2PIVqRZO8MRDsXwdhnuLJHWpsoBI6kFHuNUP21cBk c7PQiz/U82CxPhi5Y+2udiGaYntXJ1Na/rEd4uc76xPsVVNzuCfbXpZ+wTYRG6Qno6lK cp3su0EP5ALJOMVJIu3GcfV/Ajl6/M2rgi4JrUgjXA54qgw0CsDP/EU26Pqi6bC9Er58 IXCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=AP3elxsP1Woa7qcw0PZXatE2eK58nbYv8KHWaCswI1M=; fh=IlHmq1Kl6WDqsYIcQXzwFqB72MHx6soicqMlhBagVr4=; b=uoJmN+8sovCdtJgR+pRqZCNSbOF1mo7YHA0TlAXSisVYJdaBQdwzbJoiewSl7aH6IL t4xFdWmHc8HG081Bv3SBvSxqJZQyu/db8Ded7qCgT6RCD0fUd/IicHAahMBSpDMEvaQF qS3T5hC5MpEC3s3Wmcw5r5Bqj18q48jg427/qhrDUHWdDuCTXZniHLaRqFLyfloE2ayf 0nmI5uc8ZS5WnmT8UnnV3O5hwHvpJDlTE5ASZ0m3KMrIOeg5fNTQG7fbd+2wX+/tKtgO JIpkpe6WhZVBi4Og+fYGmDMODNMzGfMc+O7AreqL7QD91+t1jqm8PCZWQ+n6cG6WoOQp jk2w== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=A5EAafTG; spf=pass (google.com: domain of fm-294854-20240114133937f547f83e5dc83a6a11-m8ve8q@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-294854-20240114133937f547f83e5dc83a6a11-m8Ve8q@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net. [185.136.65.227]) by gmr-mx.google.com with ESMTPS id j13-20020a63550d000000b005cdfe3274b9si502681pgb.4.2024.01.14.05.39.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 14 Jan 2024 05:39:39 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-20240114133937f547f83e5dc83a6a11-m8ve8q@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) client-ip=185.136.65.227; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=A5EAafTG; spf=pass (google.com: domain of fm-294854-20240114133937f547f83e5dc83a6a11-m8ve8q@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-294854-20240114133937f547f83e5dc83a6a11-m8Ve8q@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 20240114133937f547f83e5dc83a6a11 for ; Sun, 14 Jan 2024 14:39:37 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=AP3elxsP1Woa7qcw0PZXatE2eK58nbYv8KHWaCswI1M=; b=A5EAafTGDeQSFYun1KYWzFwGVpcRCrIUe/MOQe8OAC6c5fGHw0KWKxw/32c4cxU3qXfw6a vQvPUDN+a8Bhz1Qzu/My/nQZFPxsNeo09hrVjnN3K4IZmcbjpTPNORdblK7xevK1LOJLh2ZY SHi3eNFAmk5Bt25adXuUwCM8q9vbk=; From: Jan Kiszka To: isar-users Cc: Nishanth Menon Subject: [PATCH v2 09/11] expand-on-first-boot: Preserve MBR on expansion of GPT disks Date: Sun, 14 Jan 2024 14:39:32 +0100 Message-Id: <7dfba7df31dc420bab90708cf81f56c0c3114563.1705239574.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-TUID: aipWLR5unS4L From: Jan Kiszka In order to keep potential hybrid partition setups intact, preserve the legacy MBR when a GPT disk is being expanded. This is needed because we rewrite the partitioning via sfdisk which overwrites the MBR. In the hypbrid setup, the legacy MBR plays no role regarding the expanded partition, thus can be simply left untouched. Signed-off-by: Jan Kiszka --- .../files/expand-last-partition.sh | 10 ++++++++++ 1 file changed, 10 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 7d658864..e6dbd62e 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 @@ -38,6 +38,11 @@ if [ "$DISK_SIZE" -lt "$MINIMAL_SIZE" ]; then exit 0 fi +IS_GPT="$(sfdisk -d "${BOOT_DEV}" 2>/dev/null | grep -q "label: gpt" && echo 1)" +if [ "$IS_GPT" = "1" ]; then + dd if="${BOOT_DEV}" of=/dev/shm/__mbr__.bak count=1 +fi + LAST_PART="$(sfdisk -d "${BOOT_DEV}" 2>/dev/null | tail -1 | cut -d ' ' -f 1)" # Transform the partition table as follows: @@ -54,6 +59,11 @@ sfdisk -d "${BOOT_DEV}" 2>/dev/null | \ sed 's|^\('"${LAST_PART}"' .*, \)size=[^,]*, |\1|' | \ sfdisk --force "${BOOT_DEV}" +if [ "$IS_GPT" = "1" ]; then + dd if=/dev/shm/__mbr__.bak of="${BOOT_DEV}" + rm /dev/shm/__mbr__.bak +fi + # Inform the kernel about the partitioning change partx -u "${LAST_PART}" -- 2.35.3