From: Harald Hoyer <harald@redhat.com>
Date: Thu, 9 Jul 2015 13:27:44 +0000 (+0200)
Subject: guard ${arrays[@]} with ""
X-Git-Tag: 044~145
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3721635b2c5df033fca1e19181d7598e075f5308;p=thirdparty%2Fdracut.git

guard ${arrays[@]} with ""
---

diff --git a/dracut-functions.sh b/dracut-functions.sh
index 639c5aee6..3a0a5a25a 100755
--- a/dracut-functions.sh
+++ b/dracut-functions.sh
@@ -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
diff --git a/dracut.sh b/dracut.sh
index 54358f300..fc84a4190 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -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"
 
diff --git a/lsinitrd.sh b/lsinitrd.sh
index 94674af71..d2ddd76a6 100755
--- a/lsinitrd.sh
+++ b/lsinitrd.sh
@@ -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
diff --git a/modules.d/90btrfs/module-setup.sh b/modules.d/90btrfs/module-setup.sh
index 07711320a..9303dbe25 100755
--- a/modules.d/90btrfs/module-setup.sh
+++ b/modules.d/90btrfs/module-setup.sh
@@ -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
diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
index 40803df82..41bf37dfc 100755
--- a/modules.d/90kernel-modules/module-setup.sh
+++ b/modules.d/90kernel-modules/module-setup.sh
@@ -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
diff --git a/modules.d/95cifs/module-setup.sh b/modules.d/95cifs/module-setup.sh
index 0e6984575..f711458f2 100755
--- a/modules.d/95cifs/module-setup.sh
+++ b/modules.d/95cifs/module-setup.sh
@@ -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
diff --git a/modules.d/95nfs/module-setup.sh b/modules.d/95nfs/module-setup.sh
index 8eb542c1e..9b5b8c8f0 100755
--- a/modules.d/95nfs/module-setup.sh
+++ b/modules.d/95nfs/module-setup.sh
@@ -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
diff --git a/modules.d/95virtfs/module-setup.sh b/modules.d/95virtfs/module-setup.sh
index 97d39b980..96036ee34 100755
--- a/modules.d/95virtfs/module-setup.sh
+++ b/modules.d/95virtfs/module-setup.sh
@@ -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
diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh
index 3fbdc410a..cc94d0055 100755
--- a/modules.d/99base/module-setup.sh
+++ b/modules.d/99base/module-setup.sh
@@ -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