[PATCH] expand-on-first-boot: Fix "label: gpt" detection

[PATCH] expand-on-first-boot: Fix "label: gpt" detection

[Uladzimir Bely]

Commit 991d2e9 introduced the issue when the whole script early exits
(due to "set -x") in case grep doesn't find the pattern and produces
an error code.

In this case last partition remains non-expanded.

Fix this by masking error with "echo 0".

Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
 .../expand-on-first-boot/files/expand-last-partition.sh         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 0cb2ee21..8ab0f8f0 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
@@ -41,7 +41,7 @@ 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)"
+IS_GPT="$(sfdisk -d "${BOOT_DEV}" 2>/dev/null | grep -q "label: gpt" && echo 1 || echo 0)"
 if [ "$IS_GPT" = "1" ]; then
 	dd if="${BOOT_DEV}" of=/dev/shm/__mbr__.bak count=1
 fi
-- 
2.44.1

Re: [PATCH] expand-on-first-boot: Fix "label: gpt" detection

[Uladzimir Bely]

On Wed, 2024-05-29 at 15:09 +0300, Uladzimir Bely wrote:
> Commit 991d2e9 introduced the issue when the whole script early exits
> (due to "set -x") in case grep doesn't find the pattern and produces
> an error code.
> 
> In this case last partition remains non-expanded.
> 
> Fix this by masking error with "echo 0".
> 
> Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
> ---
>  .../expand-on-first-boot/files/expand-last-partition.sh         | 2
> +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> 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 0cb2ee21..8ab0f8f0 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
> @@ -41,7 +41,7 @@ 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)"
> +IS_GPT="$(sfdisk -d "${BOOT_DEV}" 2>/dev/null | grep -q "label: gpt"
> && echo 1 || echo 0)"
>  if [ "$IS_GPT" = "1" ]; then
>  	dd if="${BOOT_DEV}" of=/dev/shm/__mbr__.bak count=1
>  fi
> -- 
> 2.44.1
> 

Applied to next.

-- 
Best regards,
Uladzimir.