Re: [PATCH] expand-on-first-boot: Resolve errors in helper script

[Henning Schild <henning.schild@siemens.com>]

Am Tue, 24 May 2022 21:00:03 +0200
schrieb Jan Kiszka <jan.kiszka@siemens.com>:

> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> Missing quotes broke the -n test, and as we are at it, also resolve
> the shellcheck warnings.
> 
> Fixes: 15214487e19e ("expand-on-first-boot: Add support for
> devicemapper") Reported-by: Felix Moessbauer
> <felix.moessbauer@siemens.com> Signed-off-by: Jan Kiszka
> <jan.kiszka@siemens.com> ---
>  .../expand-on-first-boot/files/expand-last-partition.sh       | 4
> ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
> 
> 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 bb371e9f..8a8b7c98 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,8 +11,8 @@ set -e ROOT_DEV="$(findmnt / -o source -n)"
> ROOT_DEV_NAME=${ROOT_DEV##*/} -ROOT_DEV_SLAVE=$(ls -d
> /sys/block/${ROOT_DEV_NAME}/slaves/* 2>/dev/null | head -1) -if [ -n
> ${ROOT_DEV_SLAVE} ]; then +ROOT_DEV_SLAVE=$(find
> /sys/block/"${ROOT_DEV_NAME}"/slaves/* 2>/dev/null | head -1)

maybe 
  find /sys/block/${ROOT_DEV_NAME}/slaves/ -mindepth 1 -print -quit

 -mindepth 1 to loose the *
 -print -quit to loose the pipe head 1

Henning 

> +if [
> -n "${ROOT_DEV_SLAVE}" ]; then ROOT_DEV=/dev/${ROOT_DEV_SLAVE##*/}
>  fi
>