[PATCH] Revert "dracut-functions: $_x should exist, no need to test."

[PATCH] Revert "dracut-functions: $_x should exist, no need to test."

[Chao Wang]

This reverts commit b2d225a6698607bbcb73b6e6d12fbfc5be014102.

When there's no /sys/dev/block/$2/slaves/*/dev/ exists, $_x will
be assigned with '/sys/dev/block/$2/slaves/*/dev/', this is invalid.
That commit will lead to some warn msg like:
cat: /sys/dev/block/8:16/slaves/*/dev: No such file or directory
cat: /sys/dev/block/8:32/slaves/*/dev: No such file or directory
---
 dracut-functions.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dracut-functions.sh b/dracut-functions.sh
index a299bbb..2ad8f4a 100755
--- a/dracut-functions.sh
+++ b/dracut-functions.sh
@@ -423,6 +423,7 @@ check_block_and_slaves() {
     fi
     [[ -d /sys/dev/block/$2/slaves ]] || return 1
     for _x in /sys/dev/block/$2/slaves/*/dev; do
+        [[ -f $_x ]] || continue
         check_block_and_slaves $1 $(cat "$_x") && return 0
     done
     return 1
-- 
1.7.11.3

Re: [PATCH] Revert "dracut-functions: $_x should exist, no need to test."

[Michal Soltys]

On 2012-08-01 05:23, Chao Wang wrote:
> This reverts commit b2d225a6698607bbcb73b6e6d12fbfc5be014102.
>

For the record, your original commit could work after setting:

shopt -s nullglob

For failing globs this expands to empty string and the loop is never 
executed. All kinds of such checks could go away in any bash-expecting 
script.

Re: [PATCH] Revert "dracut-functions: $_x should exist, no need to test."

[Wang Chao]

On 08/02/2012 04:44 AM, Michal Soltys wrote:
> On 2012-08-01 05:23, Chao Wang wrote:
>> This reverts commit b2d225a6698607bbcb73b6e6d12fbfc5be014102.
>>
>
> For the record, your original commit could work after setting:
>
> shopt -s nullglob
>
> For failing globs this expands to empty string and the loop is never
> executed. All kinds of such checks could go away in any bash-expecting
> script.

Good to know! Thank you!

-Chao