Blame 0042-Clean-up-some-bashisms-from-bin-sh-scripts.patch

Harald Hoyer b38677
From bcabe0fe2570d8cd39ab6af380bce44f13092450 Mon Sep 17 00:00:00 2001
Harald Hoyer b38677
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Harald Hoyer b38677
Date: Mon, 28 Mar 2016 11:52:14 +0300
Harald Hoyer b38677
Subject: [PATCH] Clean up some bashisms from /bin/sh scripts
Harald Hoyer b38677
Harald Hoyer b38677
---
Harald Hoyer b38677
 modules.d/40network/dhclient-script.sh | 2 +-
Harald Hoyer b38677
 modules.d/40network/ifup.sh            | 2 +-
Harald Hoyer b38677
 modules.d/95fcoe/fcoe-edd.sh           | 2 +-
Harald Hoyer b38677
 modules.d/95nfs/nfs-lib.sh             | 2 +-
Harald Hoyer b38677
 4 files changed, 4 insertions(+), 4 deletions(-)
Harald Hoyer b38677
Harald Hoyer b38677
diff --git a/modules.d/40network/dhclient-script.sh b/modules.d/40network/dhclient-script.sh
Harald Hoyer b38677
index 13d2dc2..94ee9d1 100755
Harald Hoyer b38677
--- a/modules.d/40network/dhclient-script.sh
Harald Hoyer b38677
+++ b/modules.d/40network/dhclient-script.sh
Harald Hoyer b38677
@@ -95,7 +95,7 @@ setup_interface6() {
Harald Hoyer b38677
     [ -n "$hostname" ] && echo "echo ${hostname%.$domain}${domain:+.$domain} > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
Harald Hoyer b38677
 }
Harald Hoyer b38677
 
Harald Hoyer b38677
-function parse_option_121() {
Harald Hoyer b38677
+parse_option_121() {
Harald Hoyer b38677
     while [ $# -ne 0 ]; do
Harald Hoyer b38677
         mask="$1"
Harald Hoyer b38677
         shift
Harald Hoyer b38677
diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
Harald Hoyer b38677
index 7c179bd..1185523 100755
Harald Hoyer b38677
--- a/modules.d/40network/ifup.sh
Harald Hoyer b38677
+++ b/modules.d/40network/ifup.sh
Harald Hoyer b38677
@@ -277,7 +277,7 @@ if [ -z "$NO_TEAM_MASTER" ]; then
Harald Hoyer b38677
                 for slave in $teamslaves ; do
Harald Hoyer b38677
                     ip link set $slave up 2>/dev/null
Harald Hoyer b38677
                     if wait_for_if_up $slave; then
Harald Hoyer b38677
-                        working_slaves+="$slave "
Harald Hoyer b38677
+                        working_slaves="$working_slaves$slave "
Harald Hoyer b38677
                     fi
Harald Hoyer b38677
                 done
Harald Hoyer b38677
                 # Do not add slaves now
Harald Hoyer b38677
diff --git a/modules.d/95fcoe/fcoe-edd.sh b/modules.d/95fcoe/fcoe-edd.sh
Harald Hoyer b38677
index 3b07ad3..1e002d3 100755
Harald Hoyer b38677
--- a/modules.d/95fcoe/fcoe-edd.sh
Harald Hoyer b38677
+++ b/modules.d/95fcoe/fcoe-edd.sh
Harald Hoyer b38677
@@ -29,7 +29,7 @@ for disk in /sys/firmware/edd/int13_*; do
Harald Hoyer b38677
 	    driver=${driver##*/}
Harald Hoyer b38677
     fi
Harald Hoyer b38677
     # i40e uses dev_port 1 for a virtual fcoe function
Harald Hoyer b38677
-    if [ "${driver}" == "i40e" ]; then
Harald Hoyer b38677
+    if [ "${driver}" = "i40e" ]; then
Harald Hoyer b38677
 	    dev_port=1
Harald Hoyer b38677
     fi
Harald Hoyer b38677
     for nic in "${disk}"/pci_dev/net/*; do
Harald Hoyer b38677
diff --git a/modules.d/95nfs/nfs-lib.sh b/modules.d/95nfs/nfs-lib.sh
Harald Hoyer b38677
index 58aa7e3..67608b1 100755
Harald Hoyer b38677
--- a/modules.d/95nfs/nfs-lib.sh
Harald Hoyer b38677
+++ b/modules.d/95nfs/nfs-lib.sh
Harald Hoyer b38677
@@ -110,7 +110,7 @@ nfsroot_from_dhcp() {
Harald Hoyer b38677
         [ -f $f ] && . $f
Harald Hoyer b38677
     done
Harald Hoyer b38677
     [ -n "$new_root_path" ] && nfsroot_to_var "$nfs:$new_root_path"
Harald Hoyer b38677
-    [ -z "$path" ] && [ "$(getarg root=)" == "/dev/nfs" ] && path=/tftpboot/%s
Harald Hoyer b38677
+    [ -z "$path" ] && [ "$(getarg root=)" = "/dev/nfs" ] && path=/tftpboot/%s
Harald Hoyer b38677
     [ -z "$server" ] && server=$srv
Harald Hoyer b38677
     [ -z "$server" ] && server=$new_dhcp_server_identifier
Harald Hoyer b38677
     [ -z "$server" ] && server=$new_next_server