Clean up some bashisms from /bin/sh scripts

diff --git a/modules.d/40network/dhclient-script.sh b/modules.d/40network/dhclient-script.sh
index 13d2dc2bfe4e3a9287733d294d5ddc674abea0fa..94ee9d1e7ac300aa6c70e2621cfa300c1ad5b275 100755 (executable)
--- a/modules.d/40network/dhclient-script.sh
+++ b/modules.d/40network/dhclient-script.sh
@@ -95,7 +95,7 @@ setup_interface6() {
     [ -n "$hostname" ] && echo "echo ${hostname%.$domain}${domain:+.$domain} > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
 }
 
-function parse_option_121() {
+parse_option_121() {
     while [ $# -ne 0 ]; do
         mask="$1"
         shift

diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
index 7c179bdb555b2b1fbb10aeff6e8ec9b05fe81c25..118552316ae764b5e24be1c5f483ae2fb08ff20a 100755 (executable)
--- a/modules.d/40network/ifup.sh
+++ b/modules.d/40network/ifup.sh
@@ -277,7 +277,7 @@ if [ -z "$NO_TEAM_MASTER" ]; then
                 for slave in $teamslaves ; do
                     ip link set $slave up 2>/dev/null
                     if wait_for_if_up $slave; then
-                        working_slaves+="$slave "
+                        working_slaves="$working_slaves$slave "
                     fi
                 done
                 # Do not add slaves now

diff --git a/modules.d/95fcoe/fcoe-edd.sh b/modules.d/95fcoe/fcoe-edd.sh
index 3b07ad3c667221c7e340eff7da4366a9f1131758..1e002d357ba4bd4a7c84dac74cc206d5ba1813e1 100755 (executable)
--- a/modules.d/95fcoe/fcoe-edd.sh
+++ b/modules.d/95fcoe/fcoe-edd.sh
@@ -29,7 +29,7 @@ for disk in /sys/firmware/edd/int13_*; do
            driver=${driver##*/}
     fi
     # i40e uses dev_port 1 for a virtual fcoe function
-    if [ "${driver}" == "i40e" ]; then
+    if [ "${driver}" = "i40e" ]; then
            dev_port=1
     fi
     for nic in "${disk}"/pci_dev/net/*; do

diff --git a/modules.d/95nfs/nfs-lib.sh b/modules.d/95nfs/nfs-lib.sh
index 58aa7e30add06897d14a561daafa826d07313d6a..67608b1945f4b553e2f1dc59c622a37ded354d7c 100755 (executable)
--- a/modules.d/95nfs/nfs-lib.sh
+++ b/modules.d/95nfs/nfs-lib.sh
@@ -110,7 +110,7 @@ nfsroot_from_dhcp() {
         [ -f $f ] && . $f
     done
     [ -n "$new_root_path" ] && nfsroot_to_var "$nfs:$new_root_path"
-    [ -z "$path" ] && [ "$(getarg root=)" == "/dev/nfs" ] && path=/tftpboot/%s
+    [ -z "$path" ] && [ "$(getarg root=)" = "/dev/nfs" ] && path=/tftpboot/%s
     [ -z "$server" ] && server=$srv
     [ -z "$server" ] && server=$new_dhcp_server_identifier
     [ -z "$server" ] && server=$new_next_server