From cddea9fe113db27fdc0ad42b7cad4c8965f0f3ae Mon Sep 17 00:00:00 2001
From: Vladimir Sokolovsky <vlad@mellanox.com>
Date: Wed, 4 Mar 2015 11:57:54 +0200
Subject: [PATCH] Improve creation of openib.conf

Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
---
 compat-rdma.spec |  1 +
 configure        | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/compat-rdma.spec b/compat-rdma.spec
index eba74bd..7bfdf35 100755
--- a/compat-rdma.spec
+++ b/compat-rdma.spec
@@ -201,6 +201,7 @@ install -m 0644 $RPM_BUILD_DIR/%{_name}-%{_version}/ofed_scripts/openibd.service
 # Copy infiniband configuration
 install -d $RPM_BUILD_ROOT/%{RDMA_CONF_DIR}
 install -m 0644 $RPM_BUILD_DIR/%{_name}-%{_version}/ofed_scripts/openib.conf $RPM_BUILD_ROOT/%{RDMA_CONF_DIR}
+cat $RPM_BUILD_DIR/%{_name}-%{_version}/ofed_scripts/openib.conf.tmp >> $RPM_BUILD_ROOT/%{RDMA_CONF_DIR}/openib.conf
 
 %if %{build_ibp_server} || %{build_ibscif}
 # install overlay files and config
diff --git a/configure b/configure
index 03a0762..ecbfaae 100755
--- a/configure
+++ b/configure
@@ -239,13 +239,17 @@ function check_autofconf {
 }
 
 function add_conf {
-	COMMENT=$1
-	VALUE=$2
-	OICONF=${PWD}/ofed_scripts/openib.conf
-
-	echo "${COMMENT}" >> "${OICONF}"
-	echo "${VALUE}" >> "${OICONF}"
-	echo >> "${OICONF}"
+    COMMENT=$1
+    PARAM=${2%=*}
+    VALUE=${2#*=}
+    OICONF=${PWD}/ofed_scripts/openib.conf.tmp
+
+    touch $OICONF
+    if ! (grep -wq "^$PARAM" $OICONF > /dev/null 2>&1); then
+        echo >> "${OICONF}"
+        echo "${COMMENT}" >> "${OICONF}"
+        echo "${PARAM}=${VALUE}" >> "${OICONF}"
+    fi
 }
 
 main()
-- 
2.41.0