Re: [PATCH] dracut: fix arithemtic ${#VAR[@]} tests

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Am 20.03.2011 20:56, schrieb Michal Soltys:
> This patch fixes a handful of ${#VAR[@]} tests, which can't be evaluated
> as text expressions - the results is always true in such case, because
> "0" is non-empty string.
> 
> Signed-off-by: Michal Soltys <soltys@xxxxxxxx>
> ---
>  dracut |   14 +++++++-------
>  1 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/dracut b/dracut
> index 0c1cc14..dd32b88 100755
> --- a/dracut
> +++ b/dracut
> @@ -276,48 +276,48 @@ if [[ $confdir && -d $confdir ]]; then
>  fi
>  
>  # these optins add to the stuff in the config file
> -if [[ ${#add_dracutmodules_l[@]} ]]; then
> +if (( ${#add_dracutmodules_l[@]} )); then
>      while pop add_dracutmodules_l val; do
>          add_dracutmodules+=" $val "
>      done
>  fi
>  
> -if [[ ${#add_drivers_l[@]} ]]; then
> +if (( ${#add_drivers_l[@]} )); then
>      while pop add_drivers_l val; do
>          add_drivers+=" $val "
>      done
>  fi
>  
>  # these options override the stuff in the config file
> -if [[ ${#dracutmodules_l[@]} ]]; then
> +if (( ${#dracutmodules_l[@]} )); then
>      dracutmodules=''
>      while pop dracutmodules_l val; do
>          dracutmodules+="$val "
>      done
>  fi
>  
> -if [[ ${#omit_dracutmodules_l[@]} ]]; then
> +if (( ${#omit_dracutmodules_l[@]} )); then
>      omit_dracutmodules=''
>      while pop omit_dracutmodules_l val; do
>          omit_dracutmodules+="$val "
>      done
>  fi
>  
> -if [[ ${#drivers_l[@]} ]]; then
> +if (( ${#drivers_l[@]} )); then
>      drivers=''
>      while pop drivers_l val; do
>          drivers+="$val "
>      done
>  fi
>  
> -if [[ ${#filesystems_l[@]} ]]; then
> +if (( ${#filesystems_l[@]} )); then
>      filesystems=''
>      while pop filesystems_l val; do
>          filesystems+="$val "
>      done
>  fi
>  
> -if [[ ${#fw_dir_l[@]} ]]; then
> +if (( ${#fw_dir_l[@]} )); then
>      fw_dir=''
>      while pop fw_dir_l val; do
>          fw_dir+="$val "

Thanks!
--
To unsubscribe from this list: send the line "unsubscribe initramfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux SCSI]

  Powered by Linux