Re: [PATCH] Take into account lib64 dirs when detecting version, modules and params

[Andrei Borzenkov <arvidjaar-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>]

В Sun, 11 Jan 2015 15:12:10 +0100
Amadeusz Żołnowski <aidecoe-2qtfh70TtYba5EbDDlwbIw@public.gmane.org> пишет:

> ---
>  lsinitrd.sh | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/lsinitrd.sh b/lsinitrd.sh
> index 4f12c2c..dc1f88f 100755
> --- a/lsinitrd.sh
> +++ b/lsinitrd.sh
> @@ -124,7 +124,7 @@ extract_files()
>  list_modules()
>  {
>      echo "dracut modules:"
> -    $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/modules.txt' 'usr/lib/dracut/modules.txt' 2>/dev/null
> +    $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib64/dracut/modules.txt' 'lib/dracut/modules.txt' 'usr/lib/dracut/modules.txt' 2>/dev/null

How it can become lib64? Name is really hardcoded

./dracut.sh:    printf "%s\n" "$i" >> $initdir/lib/dracut/modules.txt


>      ((ret+=$?))
>  }
>  
> @@ -217,7 +217,7 @@ ret=0
>  if (( ${#filenames[@]} > 0 )); then
>      extract_files
>  else
> -    version=$($CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/dracut-*' 'usr/lib/dracut/dracut-*' 2>/dev/null)
> +    version=$($CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib64/dracut/dracut-*' 'lib/dracut/dracut-*' 'usr/lib/dracut/dracut-*' 2>/dev/null)

Can it really be lib64 here?

>      ((ret+=$?))
>      echo "Version: $version"
>      echo
> @@ -226,7 +226,7 @@ else
>          echo "========================================================================"
>      else
>          echo -n "Arguments: "
> -        $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib/dracut/build-parameter.txt' 'usr/lib/dracut/build-parameter.txt' 2>/dev/null
> +        $CAT "$image" | cpio --extract --verbose --quiet --to-stdout -- 'lib64/dracut/build-parameter.txt' 'lib/dracut/build-parameter.txt' 'usr/lib/dracut/build-parameter.txt' 2>/dev/null

Ditto.

>          echo
>          list_modules
>          list_files