Re: [PATCH] expand-on-first-boot: Fix early exit in helper script

[Jan Kiszka <jan.kiszka@siemens.com>]

On 10.06.22 05:19, Uladzimir Bely wrote:
> Changes in 342a751e introduced a regression when error from 'find'
> makes helper script early exit (with -1 error code) just after an
> attempt to assign ROOT_DEV_SLAVE variable. So, the last partition
> remained not resized.
> 
> Passing 'find' output to 'head -1' masks possible error from 'find'
> without breaking the logic and continues the script execution.
> 
> 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 f3e29a1c..934a014f 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
> @@ -11,7 +11,7 @@ set -e
>  
>  ROOT_DEV="$(findmnt / -o source -n)"
>  ROOT_DEV_NAME=${ROOT_DEV##*/}
> -ROOT_DEV_SLAVE=$(find /sys/block/"${ROOT_DEV_NAME}"/slaves -mindepth 1 -print -quit 2>/dev/null)
> +ROOT_DEV_SLAVE=$(find /sys/block/"${ROOT_DEV_NAME}"/slaves -mindepth 1 -print -quit 2>/dev/null | head -1)
>  if [ -n "${ROOT_DEV_SLAVE}" ]; then
>  	ROOT_DEV=/dev/${ROOT_DEV_SLAVE##*/}
>  fi

"-quit" is supposed to obsolete "head -1". Feel free to prove me wrong,
but that was the reason for dropping it.

Jan

-- 
Siemens AG, Technology
Competence Center Embedded Linux