From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7321338948658135040 X-Received: by 2002:a05:6e02:3048:b0:360:60e1:f94c with SMTP id be8-20020a056e02304800b0036060e1f94cmr3896064ilb.33.1704632062223; Sun, 07 Jan 2024 04:54:22 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a92:b752:0:b0:35f:95c1:96a5 with SMTP id c18-20020a92b752000000b0035f95c196a5ls405235ilm.2.-pod-prod-04-us; Sun, 07 Jan 2024 04:54:21 -0800 (PST) X-Google-Smtp-Source: AGHT+IE8AQEiZ16j5JC78/30TcICJTB7QwoW/8DhvygIV+pvWKIDk4HGHzq28ApO3YaQ1seEpMxD X-Received: by 2002:a05:6602:3812:b0:7bc:b59:a593 with SMTP id bb18-20020a056602381200b007bc0b59a593mr3855948iob.21.1704632061458; Sun, 07 Jan 2024 04:54:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704632061; cv=none; d=google.com; s=arc-20160816; b=yHkOK0MyctFzlwIsT5UlFmvNCEwJOt9woeoQPSq52NxLorf8/lyu8iBe/86KtkoUaU I1kFbUTMek3oydOMWR9ltyI2aF8k9m1YbOJr6AMq9Kj8jrp+OC3HQCINexmxmN2tpryJ SUunNGvBtixvKHmNSUQLETxQ36lqEKrjjuYZSsfPlT3ud2lTXcJUoyQZNzVPsi1FOOXh nuMh9NxqNcbrpfX4VWHgIuKxOptt1yuN+KSH0TMmG/RLF/CM2IYKhJtseXavBEnJLduq QdUzUZPez9J3/uVb+IC690RTGn1FC7VGBm17+2Xuw5+GjOe/4SjBycyS0PihB9Xsz6L4 /eQg== 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=qN6MsepT48aN3CvWoJt5tBH3KT0scf+fVshys0iOrPStRS3tlOaLFNShkGHRmiTm1J QtDWtj7bEaTklmjgn+uasZ454bq7wOBiQxLKEW64zYLdh+8iNdxunILoBsfUzy6iILT9 y374mCcyD3SgKOgkYLt7lEpJA7ao/wpQ/0dV6mgn1cNJ+9nInr034xWcA0s52YFQzZ25 Y/nMFKOn9UInOO2ZCTJZeOrE58iRknv+rI8Q14F3EV7ffSBv1AKtvxRZHBPOf17dYnjD +jf9uH6S9eOp1o4Br3TdLaOqTFZlAiJK3LoYoNGeupkZ9WLebMMUx2GtAk+/GDy6mBDJ Vung== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=LeKKX2g9; spf=pass (google.com: domain of fm-294854-20240107125419e0aed98e6d7911eb56-njnvsw@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-20240107125419e0aed98e6d7911eb56-NJnVsW@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id z20-20020a056638241400b0046e0a7d5fffsi261198jat.2.2024.01.07.04.54.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 Jan 2024 04:54:21 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-20240107125419e0aed98e6d7911eb56-njnvsw@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=LeKKX2g9; spf=pass (google.com: domain of fm-294854-20240107125419e0aed98e6d7911eb56-njnvsw@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-20240107125419e0aed98e6d7911eb56-NJnVsW@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20240107125419e0aed98e6d7911eb56 for ; Sun, 07 Jan 2024 13:54:19 +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=LeKKX2g9Ht40XH7pm2aP4eaFw13yqNjDneKVJT0KH5b33GIpAb82uxueTE4KD9CShz0TWU LCfckOescSehwafCOEhkriQOJSNjchWdez/9RWtpOHBpnsKSSp/4YAOI57M+Go+aRy3cg9R5 qSskC3auiJV/jktAd4dEoLK5L0xdo=; From: Jan Kiszka To: isar-users Cc: Nishanth Menon Subject: [PATCH 9/9] expand-on-first-boot: Preserve MBR on expansion of GPT disks Date: Sun, 7 Jan 2024 13:54:16 +0100 Message-Id: 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: F8/X2U4ozKQH 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