guard ${arrays[@]} with ""

This commit is contained in:
Harald Hoyer 2015-07-09 15:27:44 +02:00
parent 694725abf0
commit 3721635b2c
9 changed files with 16 additions and 16 deletions

View File

@ -596,7 +596,7 @@ for_each_host_dev_fs()
local _dev
local _ret=1
[[ "${!host_fs_types[@]}" ]] || return 0
[[ "${#host_fs_types[@]}" ]] || return 0
for _dev in "${!host_fs_types[@]}"; do
$_func "$_dev" "${host_fs_types[$_dev]}" && _ret=0
@ -657,7 +657,7 @@ for_each_host_dev_and_slaves_all()
[[ "${host_devs[@]}" ]] || return 0
for _dev in ${host_devs[@]}; do
for _dev in "${host_devs[@]}"; do
[[ -b "$_dev" ]] || continue
if check_block_and_slaves_all $_func $(get_maj_min $_dev); then
_ret=0
@ -673,7 +673,7 @@ for_each_host_dev_and_slaves()
[[ "${host_devs[@]}" ]] || return 0
for _dev in ${host_devs[@]}; do
for _dev in "${host_devs[@]}"; do
[[ -b "$_dev" ]] || continue
check_block_and_slaves $_func $(get_maj_min $_dev) && return 0
done
@ -1276,7 +1276,7 @@ check_mount() {
local _ret
local _moddep
[ "${#host_fs_types[*]}" -le 0 ] && return 1
[ "${#host_fs_types[@]}" -le 0 ] && return 1
# If we are already scheduled to be loaded, no need to check again.
[[ " $mods_to_load " == *\ $_mod\ * ]] && return 0

View File

@ -1220,7 +1220,7 @@ _get_fs_type() {
return 1
}
for dev in ${host_devs[@]}; do
for dev in "${host_devs[@]}"; do
_get_fs_type "$dev"
check_block_and_slaves_all _get_fs_type "$(get_maj_min "$dev")"
done
@ -1455,8 +1455,8 @@ if [[ $no_kernel != yes ]]; then
fi
if [[ $kernel_only != yes ]]; then
(( ${#install_items[@]} > 0 )) && inst_multiple ${install_items[@]}
(( ${#install_optional_items[@]} > 0 )) && inst_multiple -o ${install_optional_items[@]}
(( ${#install_items[@]} > 0 )) && inst_multiple "${install_items[@]}"
(( ${#install_optional_items[@]} > 0 )) && inst_multiple -o "${install_optional_items[@]}"
[[ $kernel_cmdline ]] && printf "%s\n" "$kernel_cmdline" >> "${initdir}/etc/cmdline.d/01-default.conf"

View File

@ -117,7 +117,7 @@ dracutlibdirs() {
extract_files()
{
(( ${#filenames[@]} == 1 )) && nofileinfo=1
for f in ${!filenames[@]}; do
for f in "${!filenames[@]}"; do
[[ $nofileinfo ]] || echo "initramfs:/$f"
[[ $nofileinfo ]] || echo "========================================================================"
$CAT $image | cpio --extract --verbose --quiet --to-stdout $f 2>/dev/null

View File

@ -8,7 +8,7 @@ check() {
require_binaries btrfs || return 1
[[ $hostonly ]] || [[ $mount_needs ]] && {
for fs in ${host_fs_types[@]}; do
for fs in "${host_fs_types[@]}"; do
[[ "$fs" == "btrfs" ]] && return 0
done
return 255

View File

@ -74,7 +74,7 @@ installkernel() {
instmods '=fs'
fi
else
for i in $(host_fs_all); do
for i in "${host_fs_types[@]}"; do
hostonly='' instmods $i
done
fi

View File

@ -6,7 +6,7 @@ check() {
require_binaries mount.cifs || return 1
[[ $hostonly ]] || [[ $mount_needs ]] && {
for fs in ${host_fs_types[@]}; do
for fs in "${host_fs_types[@]}"; do
[[ "$fs" == "cifs" ]] && return 0
done
return 255

View File

@ -7,7 +7,7 @@ check() {
require_binaries rpc.statd mount.nfs mount.nfs4 umount || return 1
[[ $hostonly ]] || [[ $mount_needs ]] && {
for fs in ${host_fs_types[@]}; do
for fs in "${host_fs_types[@]}"; do
[[ "$fs" == "nfs" ]] && return 0
[[ "$fs" == "nfs3" ]] && return 0
[[ "$fs" == "nfs4" ]] && return 0

View File

@ -3,7 +3,7 @@
# called by dracut
check() {
[[ $hostonly ]] || [[ $mount_needs ]] && {
for fs in ${host_fs_types[@]}; do
for fs in "${host_fs_types[@]}"; do
[[ "$fs" == "9p" ]] && return 0
done
return 255

View File

@ -101,15 +101,15 @@ install() {
. "$moddir/dracut-lib.sh"
for _dev in ${host_devs[@]}; do
for _dev2 in ${root_devs[@]}; do
for _dev in "${host_devs[@]}"; do
for _dev2 in "${root_devs[@]}"; do
[[ "$_dev" == "$_dev2" ]] && continue 2
done
# We only actually wait for real devs - swap is only needed
# for resume and udev rules generated when parsing resume=
# argument take care of the waiting for us
for _dev2 in ${swap_devs[@]}; do
for _dev2 in "${swap_devs[@]}"; do
[[ "$_dev" == "$_dev2" ]] && continue 2
done